telephone-clients 3.0.84 → 3.0.85

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": "telephone-clients",
3
- "version": "3.0.84",
3
+ "version": "3.0.85",
4
4
  "description": "呼叫模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -279,6 +279,7 @@ getallfee(){
279
279
  unit:"",
280
280
  f_material_price:"",
281
281
  f_typenumber:"",
282
+ f_typename:""
282
283
  })
283
284
  },
284
285
  getmaterialTYPE(){
@@ -522,6 +523,7 @@ getallfee(){
522
523
  }
523
524
  for (let i = 0; i < this.material.length; i++) {
524
525
  this.material[i].f_process_id = this.selectdata.f_process_id
526
+ this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number
525
527
  if (isEmpty(this.material[i].f_state)) {
526
528
  this.material[i].f_state = '未收费'
527
529
  }
@@ -531,6 +533,7 @@ getallfee(){
531
533
  imgs: imgs,
532
534
  f_process_id: this.selectdata.f_process_id
533
535
  }
536
+ console.log("要保存了666",data)
534
537
  HostApp.__this__ = this
535
538
  HostApp.logicWithHint({
536
539
  // logic别名,key必须为logic
@@ -65,6 +65,7 @@ export default {
65
65
  this.item.f_typenumber = res['value']['materialNumber'].name
66
66
  this.item.unit = res['value']['materialNumber'].unit
67
67
  this.item.f_material_price = res['value']['materialNumber'].price
68
+ this.item.f_typename = res['value']['typeName'].name
68
69
  }
69
70
 
70
71
  }
@@ -1,222 +1,222 @@
1
- <template>
2
- <div class="flex-row">
3
- <div style="height: 95%" class="basic-main" >
4
- <criteria-paged :model="model" v-ref:cp>
5
- <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
6
- <div class="form-horizontal select-overspread container-fluid auto" partial>
7
- <div class="row">
8
- <div class="form-group col-sm-3">
9
- <label class="font_normal_body">工单编号:</label>
10
- <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_service_id"
11
- v-on:keyup.enter="$parent.$parent.search()"
12
- condition="sw.f_service_id = '{}'">
13
- </div>
14
- <div class="form-group col-sm-3">
15
- <label class="font_normal_body">操&ensp;作&ensp;人:</label>
16
- <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
17
- v-on:keyup.enter="$parent.$parent.search()"
18
- condition="sw.f_operator like '%{}%'">
19
- </div>
20
- <div class="form-group col-sm-3 button-range">
21
- <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
22
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
23
- <export-excel :data="$parent.$parent.getCondition"
24
- :field="$parent.$parent.getfield"
25
- sqlurl="rs/sql/getmaterialservice"
26
- sql-name="getmaterialservice"
27
- template-name='工单材料明细导出'
28
- :choose-col="true"></export-excel>
29
- <div style="float: right;" class="button_spacing button_search"
30
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
31
- @click="$parent.$parent.hidden()"></div>
32
- </div>
33
- </div>
34
- <div class="row" v-show="$parent.$parent.criteriaShow">
35
- <div class="form-group col-sm-3">
36
- <label class="font_normal_body">客户名称:</label>
37
- <input type="text" style="width: 60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
38
- v-on:keyup.enter="$parent.$parent.search()"
39
- condition="sw.f_user_name like '%{}%'">
40
- </div>
41
- <div class="form-group col-sm-3">
42
- <label class="font_normal_body">地&emsp;&emsp;址:</label>
43
- <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
44
- v-on:keyup.enter="$parent.$parent.search()"
45
- condition="sw.f_address like '%{}%'">
46
- </div>
47
- <div class="form-group col-sm-3">
48
- <label class="font_normal_body">材料分类:</label>
49
- <input type="text" style="width: 60%" class="input_search" placeholder='材料分类' v-model="model.f_typename"
50
- v-on:keyup.enter="$parent.$parent.search()"
51
- condition="ms.f_typename like '%{}%'">
52
- </div>
53
- <div class="form-group col-sm-3">
54
- <label class="font_normal_body">材料名称:</label>
55
- <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_material_name"
56
- v-on:keyup.enter="$parent.$parent.search()"
57
- condition="ms.f_material_name like '%{}%'">
58
- </div>
59
- <div class="form-group col-sm-3">
60
- <label class="font_normal_body">材料型号:</label>
61
- <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_typenumber"
62
- v-on:keyup.enter="$parent.$parent.search()"
63
- condition="ms.f_typenumber like '%{}%'">
64
- </div>
65
- <div class="form-group col-sm-3">
66
- <label class="font_normal_body">材料数量:</label>
67
- <input type="text" style="width: 60%" class="input_search" placeholder='材料数量' v-model="model.f_material_number"
68
- v-on:keyup.enter="$parent.$parent.search()"
69
- condition="ms.f_material_number = '{}'">
70
- </div>
71
- <div class="form-group col-sm-3">
72
- <label class="font_normal_body">材料单价:</label>
73
- <input type="text" style="width: 60%" class="input_search" placeholder='材料单价' v-model="model.f_material_price"
74
- v-on:keyup.enter="$parent.$parent.search()"
75
- condition="ms.f_material_price = '{}'">
76
- </div>
77
- <div class="form-group col-sm-3">
78
- <label for="startDate" class="font_normal_body">开始时间:</label>
79
- <datepicker id="startDate" placeholder="开始日期"
80
- style="width: 60%!important;"
81
- v-model="model.startDate"
82
- :value.sync="model.startDate"
83
- :format="'yyyy-MM-dd 00:00:00'"
84
- :show-reset-button="true"
85
- condition="ms.f_date >= '{}'">
86
- </datepicker>
87
- </div>
88
- <div class="form-group col-sm-3">
89
- <label for="endDate" class="font_normal_body">结束时间:</label>
90
- <datepicker id="endDate" placeholder="结束日期"
91
- style="width: 60%!important;"
92
- v-model="model.endDate"
93
- :value.sync="model.endDate"
94
- :format="'yyyy-MM-dd 23:59:59'"
95
- :show-reset-button="true"
96
- condition="ms.f_date <= '{}'">
97
- </datepicker>
98
- </div>
99
- </div>
100
- </div>
101
- </criteria>
102
- <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
103
- <template partial='head'>
104
- <tr>
105
- <th>序号</th>
106
- <th>工单编号</th>
107
- <th>客户名称</th>
108
- <th>地址</th>
109
- <th>材料分类</th>
110
- <th>材料名称</th>
111
- <th>材料型号</th>
112
- <th>材料数量</th>
113
- <th>材料单价</th>
114
- <th>金额</th>
115
- <th>操作人</th>
116
- <th>操作时间</th>
117
- </tr>
118
- </template>
119
- <template partial='body'>
120
- <tr >
121
- <td style="text-align: center;">
122
- <nobr><font>{{$index+1}}</font></nobr>
123
- </td>
124
- <td style="text-align: center;">
125
- <nobr><font>{{row.f_service_id}}</font></nobr>
126
- </td>
127
- <td style="text-align: center;">
128
- <nobr><font>{{row.f_user_name}}</font></nobr>
129
- </td>
130
- <td style="text-align: center;">
131
- <nobr><font>{{row.f_address}}</font></nobr>
132
- </td>
133
- <td style="text-align: center;">
134
- <nobr><font>{{row.f_typename}}</font></nobr>
135
- </td>
136
- <td style="text-align: center;">
137
- <nobr><font>{{row.f_material_name}}</font></nobr>
138
- </td>
139
- <td style="text-align: center;">
140
- <nobr><font>{{row.f_typenumber}}</font></nobr>
141
- </td>
142
- <td style="text-align: center;">
143
- <nobr><font>{{row.f_material_number}}</font></nobr>
144
- </td>
145
- <td style="text-align: center;">
146
- <nobr><font>{{row.f_material_price}}</font></nobr>
147
- </td>
148
- <td style="text-align: center;">
149
- <nobr><font>{{row.f_fee}}</font></nobr>
150
- </td>
151
- <td style="text-align: center;">
152
- <nobr><font>{{row.f_operators}}</font></nobr>
153
- </td>
154
- <td style="text-align: center;">
155
- <nobr><font>{{row.f_date}}</font></nobr>
156
- </td>
157
- </tr>
158
- </template>
159
- </data-grid>
160
- </criteria-paged>
161
- </div>
162
-
163
- </div>
164
- </template>
165
-
166
- <script>
167
- import {PagedList} from 'vue-client'
168
- export default {
169
- title: '材料明细',
170
- data () {
171
- return {
172
- model: new PagedList('rs/sql/getmaterialservice', 30, null),
173
- criteriaShow: false,
174
- getfield: {
175
- 'f_service_id': '工单编号',
176
- 'f_user_name': '客户名称',
177
- 'f_address': '地址',
178
- 'f_typename': '材料分类',
179
- 'f_material_name': '材料名称',
180
- 'f_typenumber': '材料型号',
181
- 'f_material_number': '材料数量',
182
- 'f_material_price': '材料单价',
183
- 'f_fee': '金额',
184
- 'f_operators': '操作人',
185
- 'f_date': '操作时间'
186
- }
187
- }
188
- },
189
- ready () {
190
- // 调用查询
191
- this.search()
192
- },
193
- methods: {
194
- clear () {
195
- Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
196
- this.$refs.cp.$refs.cri.model[key] = ''
197
- })
198
- },
199
- searchCondition (args) {
200
- args.condition = args.condition + ` and sw.f_orgid = '${this.$login.f.orgid}'`
201
- this.model.search(args.condition, args.model)
202
- },
203
- // 查询
204
- search () {
205
- this.$refs.cp.$refs.cri.search()
206
- },
207
- hidden () {
208
- this.criteriaShow = !this.criteriaShow
209
- },
210
- },
211
- computed: {
212
- getCondition () {
213
- return {
214
- condition: this.model.condition
215
- }
216
- }
217
- }
218
- }
219
- </script>
220
-
221
- <style scoped>
222
- </style>
1
+ <template>
2
+ <div class="flex-row">
3
+ <div style="height: 95%" class="basic-main" >
4
+ <criteria-paged :model="model" v-ref:cp>
5
+ <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
6
+ <div class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="form-group col-sm-3">
9
+ <label class="font_normal_body">工单编号:</label>
10
+ <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_service_id"
11
+ v-on:keyup.enter="$parent.$parent.search()"
12
+ condition="sw.f_service_id = '{}'">
13
+ </div>
14
+ <div class="form-group col-sm-3">
15
+ <label class="font_normal_body">操&ensp;作&ensp;人:</label>
16
+ <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
17
+ v-on:keyup.enter="$parent.$parent.search()"
18
+ condition="sw.f_operator like '%{}%'">
19
+ </div>
20
+ <div class="form-group col-sm-3 button-range">
21
+ <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
22
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
23
+ <export-excel :data="$parent.$parent.getCondition"
24
+ :field="$parent.$parent.getfield"
25
+ sqlurl="rs/sql/getmaterialservice"
26
+ sql-name="getmaterialservice"
27
+ template-name='工单材料明细导出'
28
+ :choose-col="true"></export-excel>
29
+ <div style="float: right;" class="button_spacing button_search"
30
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
31
+ @click="$parent.$parent.hidden()"></div>
32
+ </div>
33
+ </div>
34
+ <div class="row" v-show="$parent.$parent.criteriaShow">
35
+ <div class="form-group col-sm-3">
36
+ <label class="font_normal_body">客户名称:</label>
37
+ <input type="text" style="width: 60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
38
+ v-on:keyup.enter="$parent.$parent.search()"
39
+ condition="sw.f_user_name like '%{}%'">
40
+ </div>
41
+ <div class="form-group col-sm-3">
42
+ <label class="font_normal_body">地&emsp;&emsp;址:</label>
43
+ <input type="text" style="width: 60%" class="input_search" placeholder='地址' v-model="model.f_address"
44
+ v-on:keyup.enter="$parent.$parent.search()"
45
+ condition="sw.f_address like '%{}%'">
46
+ </div>
47
+ <div class="form-group col-sm-3">
48
+ <label class="font_normal_body">材料分类:</label>
49
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料分类' v-model="model.f_typename"
50
+ v-on:keyup.enter="$parent.$parent.search()"
51
+ condition="ms.f_typename like '%{}%'">
52
+ </div>
53
+ <div class="form-group col-sm-3">
54
+ <label class="font_normal_body">材料名称:</label>
55
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_material_name"
56
+ v-on:keyup.enter="$parent.$parent.search()"
57
+ condition="ms.f_material_name like '%{}%'">
58
+ </div>
59
+ <div class="form-group col-sm-3">
60
+ <label class="font_normal_body">材料型号:</label>
61
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_typenumber"
62
+ v-on:keyup.enter="$parent.$parent.search()"
63
+ condition="ms.f_typenumber like '%{}%'">
64
+ </div>
65
+ <div class="form-group col-sm-3">
66
+ <label class="font_normal_body">材料数量:</label>
67
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料数量' v-model="model.f_material_number"
68
+ v-on:keyup.enter="$parent.$parent.search()"
69
+ condition="ms.f_material_number = '{}'">
70
+ </div>
71
+ <div class="form-group col-sm-3">
72
+ <label class="font_normal_body">材料单价:</label>
73
+ <input type="text" style="width: 60%" class="input_search" placeholder='材料单价' v-model="model.f_material_price"
74
+ v-on:keyup.enter="$parent.$parent.search()"
75
+ condition="ms.f_material_price = '{}'">
76
+ </div>
77
+ <div class="form-group col-sm-3">
78
+ <label for="startDate" class="font_normal_body">开始时间:</label>
79
+ <datepicker id="startDate" placeholder="开始日期"
80
+ style="width: 60%!important;"
81
+ v-model="model.startDate"
82
+ :value.sync="model.startDate"
83
+ :format="'yyyy-MM-dd 00:00:00'"
84
+ :show-reset-button="true"
85
+ condition="ms.f_date >= '{}'">
86
+ </datepicker>
87
+ </div>
88
+ <div class="form-group col-sm-3">
89
+ <label for="endDate" class="font_normal_body">结束时间:</label>
90
+ <datepicker id="endDate" placeholder="结束日期"
91
+ style="width: 60%!important;"
92
+ v-model="model.endDate"
93
+ :value.sync="model.endDate"
94
+ :format="'yyyy-MM-dd 23:59:59'"
95
+ :show-reset-button="true"
96
+ condition="ms.f_date <= '{}'">
97
+ </datepicker>
98
+ </div>
99
+ </div>
100
+ </div>
101
+ </criteria>
102
+ <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
103
+ <template partial='head'>
104
+ <tr>
105
+ <th>序号</th>
106
+ <th>工单编号</th>
107
+ <th>客户名称</th>
108
+ <th>地址</th>
109
+ <th>材料分类</th>
110
+ <th>材料名称</th>
111
+ <th>材料型号</th>
112
+ <th>材料数量</th>
113
+ <th>材料单价</th>
114
+ <th>金额</th>
115
+ <th>操作人</th>
116
+ <th>操作时间</th>
117
+ </tr>
118
+ </template>
119
+ <template partial='body'>
120
+ <tr >
121
+ <td style="text-align: center;">
122
+ <nobr><font>{{$index+1}}</font></nobr>
123
+ </td>
124
+ <td style="text-align: center;">
125
+ <nobr><font>{{row.f_service_id}}</font></nobr>
126
+ </td>
127
+ <td style="text-align: center;">
128
+ <nobr><font>{{row.f_user_name}}</font></nobr>
129
+ </td>
130
+ <td style="text-align: center;">
131
+ <nobr><font>{{row.f_address}}</font></nobr>
132
+ </td>
133
+ <td style="text-align: center;">
134
+ <nobr><font>{{row.f_typename}}</font></nobr>
135
+ </td>
136
+ <td style="text-align: center;">
137
+ <nobr><font>{{row.f_material_name}}</font></nobr>
138
+ </td>
139
+ <td style="text-align: center;">
140
+ <nobr><font>{{row.f_typenumber}}</font></nobr>
141
+ </td>
142
+ <td style="text-align: center;">
143
+ <nobr><font>{{row.f_material_number}}</font></nobr>
144
+ </td>
145
+ <td style="text-align: center;">
146
+ <nobr><font>{{row.f_material_price}}</font></nobr>
147
+ </td>
148
+ <td style="text-align: center;">
149
+ <nobr><font>{{row.f_fee}}</font></nobr>
150
+ </td>
151
+ <td style="text-align: center;">
152
+ <nobr><font>{{row.f_operators}}</font></nobr>
153
+ </td>
154
+ <td style="text-align: center;">
155
+ <nobr><font>{{row.f_date}}</font></nobr>
156
+ </td>
157
+ </tr>
158
+ </template>
159
+ </data-grid>
160
+ </criteria-paged>
161
+ </div>
162
+
163
+ </div>
164
+ </template>
165
+
166
+ <script>
167
+ import {PagedList} from 'vue-client'
168
+ export default {
169
+ title: '材料明细',
170
+ data () {
171
+ return {
172
+ model: new PagedList('rs/sql/getmaterialservice', 30, null),
173
+ criteriaShow: false,
174
+ getfield: {
175
+ 'f_service_id': '工单编号',
176
+ 'f_user_name': '客户名称',
177
+ 'f_address': '地址',
178
+ 'f_typename': '材料分类',
179
+ 'f_material_name': '材料名称',
180
+ 'f_typenumber': '材料型号',
181
+ 'f_material_number': '材料数量',
182
+ 'f_material_price': '材料单价',
183
+ 'f_fee': '金额',
184
+ 'f_operators': '操作人',
185
+ 'f_date': '操作时间'
186
+ }
187
+ }
188
+ },
189
+ ready () {
190
+ // 调用查询
191
+ this.search()
192
+ },
193
+ methods: {
194
+ clear () {
195
+ Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
196
+ this.$refs.cp.$refs.cri.model[key] = ''
197
+ })
198
+ },
199
+ searchCondition (args) {
200
+ args.condition = args.condition + ` and sw.f_filiale_id = '${this.$login.f.orgid}'`
201
+ this.model.search(args.condition, args.model)
202
+ },
203
+ // 查询
204
+ search () {
205
+ this.$refs.cp.$refs.cri.search()
206
+ },
207
+ hidden () {
208
+ this.criteriaShow = !this.criteriaShow
209
+ },
210
+ },
211
+ computed: {
212
+ getCondition () {
213
+ return {
214
+ condition: this.model.condition
215
+ }
216
+ }
217
+ }
218
+ }
219
+ </script>
220
+
221
+ <style scoped>
222
+ </style>