apply-clients 4.1.64 → 4.1.65

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.64",
3
+ "version": "4.1.65",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -35,7 +35,8 @@
35
35
  "lib-flexible": "^0.3.2",
36
36
  "px2rem-loader": "^0.1.9",
37
37
  "vue": "^1.0.17",
38
- "vue-bubble": "^1.0.3"
38
+ "vue-bubble": "^1.0.3",
39
+ "vue-concise-slider": "^4.2.1"
39
40
  },
40
41
  "devDependencies": {
41
42
  "babel-core": "^6.0.0",
package/src/App.vue CHANGED
@@ -1,20 +1,20 @@
1
- <template>
2
- <div>
3
- <app-base class="bg">
4
- <div class='flex'>
5
- <article>
6
- <route :comp="{name: 'login'}"></route>
7
- </article>
8
- </div>
9
- </app-base>
10
- </div>
11
- </template>
12
-
13
- <script>
14
-
15
-
16
- export default {
17
-
18
-
19
- }
20
- </script>
1
+ <template>
2
+ <div>
3
+ <app-base class="bg">
4
+ <div class='flex'>
5
+ <article>
6
+ <route :comp="{name: 'login'}"></route>
7
+ </article>
8
+ </div>
9
+ </app-base>
10
+ </div>
11
+ </template>
12
+
13
+ <script>
14
+
15
+
16
+ export default {
17
+
18
+
19
+ }
20
+ </script>
@@ -7,7 +7,7 @@
7
7
  <div class="form-group col-sm-5">
8
8
  <label class="font_normal_body">项目名称:</label>
9
9
  <input type="text" class="input_search" v-model="model.f_user_name"
10
- v-on:keyup.enter="$parent.$parent.search()" condition=" (f_entry_name like '%{}%') " placeholder='请输入'>
10
+ v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name ='{}' " placeholder='请输入'>
11
11
  </div>
12
12
  <div class="form-group col-sm-4">
13
13
  <label class="font_normal_body">报建编号:</label>
@@ -100,7 +100,7 @@
100
100
  <tr class="title">
101
101
  <th style="white-space: nowrap;">序号</th>
102
102
  <th style="white-space: nowrap;">报建编号</th>
103
- <th style="white-space: nowrap;">项目名称/客户名称/联系人</th>
103
+ <th style="white-space: nowrap;">项目名称</th>
104
104
  <th style="white-space: nowrap;">合同编号</th>
105
105
  <!-- <th style="white-space: nowrap;">电话</th>-->
106
106
  <!-- <th style="white-space: nowrap;">地址</th>-->
@@ -120,7 +120,8 @@
120
120
  <nobr>{{row.f_apply_num}}</nobr>
121
121
  </td>
122
122
  <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
123
- <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
123
+ <nobr>{{row.f_entry_name}}</nobr>
124
+ <nobr>{{row.f_entry_name}}</nobr>
124
125
  </td>
125
126
  <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
126
127
  <nobr>{{row.f_contract_number}}</nobr>
@@ -1,176 +1,176 @@
1
- <template>
2
- <div>
3
- <criteria-paged :model="model" v-ref:paged :pager="false">
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-12 button-range">
8
- <button class="button_search button_spacing" @click="search()">查询</button>
9
- <div
10
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
11
- @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
12
- class="button_spacing"
13
- style="float: right">
14
- </div>
15
- </div>
16
- </div>
17
- <div class="row" v-show="$parent.$parent.criteriaShow">
18
- <div class="form-group col-sm-12">
19
- <label class="font_normal_body">&emsp;</label>
20
- <input type="text" class="input_search" v-model="model.f_user_name"
21
- v-on:keyup.enter="search" condition="f_user_name like '%{}%'" placeholder='联系人'>
22
- </div>
23
- <div class="form-group col-sm-12">
24
- <label class="font_normal_body">&emsp;</label>
25
- <input type="text" class="input_search" v-model="model.f_phone"
26
- v-on:keyup.enter="search" condition="f_phone like '%{}%'" placeholder='电话号码'>
27
- </div>
28
- </div>
29
- </div>
30
- </criteria>
31
- <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
32
- <template partial='head'>
33
- <tr class="title">
34
- <th colspan="2" style="white-space: nowrap;">已终止报建工程</th>
35
- </tr>
36
- </template>
37
- <template partial='body'>
38
- <tr>
39
- <td style="text-align: center;">{{row.f_user_name}}</td>
40
- <td style="text-align: center;">
41
- <dropdown>
42
- <button @click="" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
43
- <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
44
- </button>
45
- </dropdown>
46
- </td>
47
- </tr>
48
- </template>
49
- </data-grid>
50
- <!-- <div partial="list" style="overflow: auto">-->
51
- <!-- <div class="panel panel-default auto" v-for="item in model.rows">-->
52
- <!-- <div class="panel-heading auto" style="background-color: #E8F4FF" @click="$parent.$parent.showTable(item)">-->
53
- <!-- {{item.f_user_name}}-->
54
- <!-- <div style="float: right">-->
55
- <!-- <dropdown class="auto">-->
56
- <!-- <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">-->
57
- <!-- <span class="glyphicon glyphicon-th-list"></span>-->
58
- <!-- </button>-->
59
- <!-- <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">-->
60
- <!-- <li>-->
61
- <!-- <a href="#" @click.stop="$parent.$parent.operate(item)">撤销</a>-->
62
- <!-- </li>-->
63
- <!-- </ul>-->
64
- <!-- </dropdown>-->
65
- <!-- </div>-->
66
- <!-- </div>-->
67
- <!-- <table class="table" v-if="$parent.$parent.tableShow(item)">-->
68
- <!-- <tr>-->
69
- <!-- <td><b>终止原因</b></td>-->
70
- <!-- <td>-->
71
- <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_stop_remarks">-->
72
- <!-- {{item.f_stop_remarks.length > 5 ? item.f_stop_remarks.substring(0,5) + '...' : item.f_stop_remarks.length}}-->
73
- <!-- </span>-->
74
- <!-- </td>-->
75
- <!-- </tr>-->
76
- <!-- <tr>-->
77
- <!-- <td><b>流程节点</b></td>-->
78
- <!-- <td>-->
79
- <!-- <span data-toggle="tooltip" data-placement="left" :title="item.defname">-->
80
- <!-- {{item.defname.length > 5 ? item.defname.substring(0,5) + '...' : item.defname}}-->
81
- <!-- </span>-->
82
- <!-- </td>-->
83
- <!-- </tr>-->
84
- <!-- <tr>-->
85
- <!-- <td><b>操作人</b></td>-->
86
- <!-- <td>-->
87
- <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_operator">-->
88
- <!-- {{item.f_operator.length > 5 ? item.f_operator.substring(0,5) + '...' : item.f_operator}}-->
89
- <!-- </span>-->
90
- <!-- </td>-->
91
- <!-- </tr>-->
92
- <!-- <tr>-->
93
- <!-- <td><b>操作部门</b></td>-->
94
- <!-- <td>-->
95
- <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_department">-->
96
- <!-- {{item.f_department.length > 5 ? item.f_department.substring(0,5) + '...' : item.f_department}}-->
97
- <!-- </span>-->
98
- <!-- </td>-->
99
- <!-- </tr>-->
100
- <!-- <tr>-->
101
- <!-- <td><b>操作日期</b></td>-->
102
- <!-- <td>-->
103
- <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_date">-->
104
- <!-- {{new Date(item.f_date).Format('yyyy-MM-dd')}}...-->
105
- <!-- </span>-->
106
- <!-- </td>-->
107
- <!-- </tr>-->
108
- <!-- </table>-->
109
- <!-- </div>-->
110
- <!-- </div>-->
111
- </criteria-paged>
112
- </div>
113
- </template>
114
- <script>
115
- /**
116
- *操作记录信息
117
- */
118
- import {HttpResetClass} from 'vue-client'
119
- import { PagedList } from 'vue-client'
120
- Date.prototype.Format = function (fmt) {
121
- var o = {
122
- 'M+': this.getMonth() + 1, // 月份
123
- 'd+': this.getDate(), // 日
124
- 'H+': this.getHours(), // 小时
125
- 'm+': this.getMinutes(), // 分
126
- 's+': this.getSeconds(), // 秒
127
- 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
128
- 'S': this.getMilliseconds() // 毫秒
129
- }
130
- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
131
- for (var k in o) {
132
- if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
133
- }
134
- return fmt
135
- }
136
- export default {
137
- title: '操作汇总',
138
- data () {
139
- return {
140
- model: new PagedList('rs/sql/getStopApply', 9999999, {
141
- data: {
142
- id: this.$login.f.id,
143
- orgid: this.$login.f.orgid
144
- }
145
- }),
146
- row: null, // 当前点击的数据
147
- criteriaShow: false // 控制查询条件
148
- }
149
- },
150
- props: {
151
- },
152
- ready () {
153
- this.$refs.paged.$refs.cri.search()
154
- },
155
- methods: {
156
- // 控制查询
157
- hidden () {
158
- this.criteriaShow = !this.criteriaShow
159
- },
160
- // 当前点击的卡片数据
161
- showTable (row) {
162
- this.row = row
163
- },
164
- // 判断是否显示详细信息
165
- tableShow (row) {
166
- return this.row === row
167
- },
168
- // 点击撤销
169
- operate (row) {
170
- this.$dispatch('operate', row)
171
- }
172
- },
173
- watch: {
174
- }
175
- }
176
- </script>
1
+ <template>
2
+ <div>
3
+ <criteria-paged :model="model" v-ref:paged :pager="false">
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-12 button-range">
8
+ <button class="button_search button_spacing" @click="search()">查询</button>
9
+ <div
10
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
11
+ @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
12
+ class="button_spacing"
13
+ style="float: right">
14
+ </div>
15
+ </div>
16
+ </div>
17
+ <div class="row" v-show="$parent.$parent.criteriaShow">
18
+ <div class="form-group col-sm-12">
19
+ <label class="font_normal_body">&emsp;</label>
20
+ <input type="text" class="input_search" v-model="model.f_user_name"
21
+ v-on:keyup.enter="search" condition="f_user_name like '%{}%'" placeholder='联系人'>
22
+ </div>
23
+ <div class="form-group col-sm-12">
24
+ <label class="font_normal_body">&emsp;</label>
25
+ <input type="text" class="input_search" v-model="model.f_phone"
26
+ v-on:keyup.enter="search" condition="f_phone like '%{}%'" placeholder='电话号码'>
27
+ </div>
28
+ </div>
29
+ </div>
30
+ </criteria>
31
+ <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
32
+ <template partial='head'>
33
+ <tr class="title">
34
+ <th colspan="2" style="white-space: nowrap;">已终止报建工程</th>
35
+ </tr>
36
+ </template>
37
+ <template partial='body'>
38
+ <tr>
39
+ <td style="text-align: center;">{{row.f_user_name}}</td>
40
+ <td style="text-align: center;">
41
+ <dropdown>
42
+ <button @click="" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
43
+ <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
44
+ </button>
45
+ </dropdown>
46
+ </td>
47
+ </tr>
48
+ </template>
49
+ </data-grid>
50
+ <!-- <div partial="list" style="overflow: auto">-->
51
+ <!-- <div class="panel panel-default auto" v-for="item in model.rows">-->
52
+ <!-- <div class="panel-heading auto" style="background-color: #E8F4FF" @click="$parent.$parent.showTable(item)">-->
53
+ <!-- {{item.f_user_name}}-->
54
+ <!-- <div style="float: right">-->
55
+ <!-- <dropdown class="auto">-->
56
+ <!-- <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">-->
57
+ <!-- <span class="glyphicon glyphicon-th-list"></span>-->
58
+ <!-- </button>-->
59
+ <!-- <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right" style=" min-width: 60px;">-->
60
+ <!-- <li>-->
61
+ <!-- <a href="#" @click.stop="$parent.$parent.operate(item)">撤销</a>-->
62
+ <!-- </li>-->
63
+ <!-- </ul>-->
64
+ <!-- </dropdown>-->
65
+ <!-- </div>-->
66
+ <!-- </div>-->
67
+ <!-- <table class="table" v-if="$parent.$parent.tableShow(item)">-->
68
+ <!-- <tr>-->
69
+ <!-- <td><b>终止原因</b></td>-->
70
+ <!-- <td>-->
71
+ <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_stop_remarks">-->
72
+ <!-- {{item.f_stop_remarks.length > 5 ? item.f_stop_remarks.substring(0,5) + '...' : item.f_stop_remarks.length}}-->
73
+ <!-- </span>-->
74
+ <!-- </td>-->
75
+ <!-- </tr>-->
76
+ <!-- <tr>-->
77
+ <!-- <td><b>流程节点</b></td>-->
78
+ <!-- <td>-->
79
+ <!-- <span data-toggle="tooltip" data-placement="left" :title="item.defname">-->
80
+ <!-- {{item.defname.length > 5 ? item.defname.substring(0,5) + '...' : item.defname}}-->
81
+ <!-- </span>-->
82
+ <!-- </td>-->
83
+ <!-- </tr>-->
84
+ <!-- <tr>-->
85
+ <!-- <td><b>操作人</b></td>-->
86
+ <!-- <td>-->
87
+ <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_operator">-->
88
+ <!-- {{item.f_operator.length > 5 ? item.f_operator.substring(0,5) + '...' : item.f_operator}}-->
89
+ <!-- </span>-->
90
+ <!-- </td>-->
91
+ <!-- </tr>-->
92
+ <!-- <tr>-->
93
+ <!-- <td><b>操作部门</b></td>-->
94
+ <!-- <td>-->
95
+ <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_department">-->
96
+ <!-- {{item.f_department.length > 5 ? item.f_department.substring(0,5) + '...' : item.f_department}}-->
97
+ <!-- </span>-->
98
+ <!-- </td>-->
99
+ <!-- </tr>-->
100
+ <!-- <tr>-->
101
+ <!-- <td><b>操作日期</b></td>-->
102
+ <!-- <td>-->
103
+ <!-- <span data-toggle="tooltip" data-placement="left" :title="item.f_date">-->
104
+ <!-- {{new Date(item.f_date).Format('yyyy-MM-dd')}}...-->
105
+ <!-- </span>-->
106
+ <!-- </td>-->
107
+ <!-- </tr>-->
108
+ <!-- </table>-->
109
+ <!-- </div>-->
110
+ <!-- </div>-->
111
+ </criteria-paged>
112
+ </div>
113
+ </template>
114
+ <script>
115
+ /**
116
+ *操作记录信息
117
+ */
118
+ import {HttpResetClass} from 'vue-client'
119
+ import { PagedList } from 'vue-client'
120
+ Date.prototype.Format = function (fmt) {
121
+ var o = {
122
+ 'M+': this.getMonth() + 1, // 月份
123
+ 'd+': this.getDate(), // 日
124
+ 'H+': this.getHours(), // 小时
125
+ 'm+': this.getMinutes(), // 分
126
+ 's+': this.getSeconds(), // 秒
127
+ 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
128
+ 'S': this.getMilliseconds() // 毫秒
129
+ }
130
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
131
+ for (var k in o) {
132
+ if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
133
+ }
134
+ return fmt
135
+ }
136
+ export default {
137
+ title: '操作汇总',
138
+ data () {
139
+ return {
140
+ model: new PagedList('rs/sql/get2StopApply', 9999999, {
141
+ data: {
142
+ id: this.$login.f.id,
143
+ orgid: this.$login.f.orgid
144
+ }
145
+ }),
146
+ row: null, // 当前点击的数据
147
+ criteriaShow: false // 控制查询条件
148
+ }
149
+ },
150
+ props: {
151
+ },
152
+ ready () {
153
+ this.$refs.paged.$refs.cri.search()
154
+ },
155
+ methods: {
156
+ // 控制查询
157
+ hidden () {
158
+ this.criteriaShow = !this.criteriaShow
159
+ },
160
+ // 当前点击的卡片数据
161
+ showTable (row) {
162
+ this.row = row
163
+ },
164
+ // 判断是否显示详细信息
165
+ tableShow (row) {
166
+ return this.row === row
167
+ },
168
+ // 点击撤销
169
+ operate (row) {
170
+ this.$dispatch('operate', row)
171
+ }
172
+ },
173
+ watch: {
174
+ }
175
+ }
176
+ </script>
@@ -7,7 +7,7 @@
7
7
  <div class="form-group col-sm-4">
8
8
  <label class="font_normal_body">项目名称:</label>
9
9
  <input type="text" class="input_search" v-model="model.f_user_name"
10
- v-on:keyup.enter="$parent.$parent.search()" condition=" (f_entry_name like '%{}%' ) " placeholder='请输入'>
10
+ v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name = '{}' " placeholder='请输入'>
11
11
  </div>
12
12
  <div class="form-group col-sm-3">
13
13
  <label class="font_normal_body">报建编号:</label>
@@ -17,9 +17,9 @@
17
17
  </div>
18
18
  <div class="form-group col-sm-5 button-range">
19
19
  <button class="button_new button_spacing" style="width: max-content"
20
- v-if="$parent.$parent.showfp &&(this.$login.f.rolesnames.indexOf('市场部报装') !== -1 || this.$login.f.rolesnames.indexOf('工程部报装') !== -1)"
20
+ v-if="this.$login.f.rolesnames.indexOf('市场部报装') !== -1 || this.$login.f.rolesnames.indexOf('工程部报装') !== -1"
21
21
  @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
22
- <button v-if="$parent.$parent.showfp" class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
22
+ <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
23
23
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
24
24
  <div
25
25
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -212,8 +212,8 @@
212
212
  f_apply_type: '', // 报建类型
213
213
  // startname: null, // 启动节点
214
214
  criteriaShow: false, // 控制查询条件显示
215
- showModal: false, // 控制发起类型选择
216
- showfp:true
215
+ showModal: false // 控制发起类型选择
216
+
217
217
  }
218
218
  },
219
219
  ready () {
@@ -295,10 +295,8 @@
295
295
 
296
296
  val.f_sub_state = "新增"
297
297
  val.f_process_id = await this.getProcessId(val.processname)
298
- val.f_contract_number=this.model.rows.f_apply_num
299
298
  // 调用ExplorationUser事件
300
299
  this.$dispatch('apply', val)
301
- this.showfp = false
302
300
  this.f_apply_type = null
303
301
  this.showModal = false
304
302
  },