sale-client 3.6.211 → 3.6.212

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 (8) hide show
  1. package/build/dev-server.js +1 -1
  2. package/package.json +1 -1
  3. package/src/filiale/lixianV3/ChangeMeter.vue +14 -0
  4. package/src/filiale/qianneng/CardList.vue +30 -0
  5. package/src/filiale/qianneng/ChangeMeter.vue +7 -0
  6. package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue +3 -2
  7. package/src/filiale/qianneng/FilesManageNew/MeterinfoTest.vue +3 -2
  8. package/src/filiale/rongcheng/UserDeviceInfoTest.vue +19 -16
package/build/dev-server.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var path = require('path')
2
- const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
2
+ const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
3
3
  var merge = require('webpack-merge')
4
4
  var baseConfig = require('./webpack.dev.conf')
5
5
  var devConfig = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.211",
3
+ "version": "3.6.212",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/lixianV3/ChangeMeter.vue CHANGED
@@ -252,6 +252,13 @@
252
252
  close-on-select clear-button></v-select>
253
253
  </div>
254
254
  </div>
255
+ <div class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
256
+ <label class="font_normal_body">新表表向</label>
257
+ <v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
258
+ :value-single="true"
259
+ close-on-select
260
+ v-model='model.f_newaroundmeter'></v-select>
261
+ </div>
255
262
  <div class="row auto">
256
263
  <div class="col-sm-12"
257
264
  v-if="!commitflag"
@@ -269,6 +276,10 @@
269
276
  ></textarea>
270
277
  </div>
271
278
  </div>
279
+ <div class="col-sm-12" >
280
+ <label class="font_normal_body ">换表原因</label>
281
+ <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_changetables_reason"></textarea>
282
+ </div>
272
283
  <div style="text-align:right;height:auto;">
273
284
  <button class="button_search" v-show="config.approve == true ? applyButtonShow : false" type="button" @click="apply()"
274
285
  :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid"
@@ -511,6 +522,9 @@ export default {
511
522
  }
512
523
  },
513
524
  computed: {
525
+ aroundmeters () {
526
+ return this.$appdata.getParam('左右表')
527
+ },
514
528
  flowmeterbrands () {
515
529
  let gasbrand = this.$GetSaleParam.getGasbrand()
516
530
  let flowmeterbrands = []
package/src/filiale/qianneng/CardList.vue CHANGED
@@ -36,6 +36,36 @@
36
36
  type="text"
37
37
  v-model="model.f_operator">
38
38
  </div>
39
+ <div class="form-group col-sm-5" v-show="$parent.$parent.$parent.criteriaShow">
40
+ <!-- <label>用户编号:</label> -->
41
+ <input class="input_search" condition="u.f_user_name like '%{}%'" placeholder='用户姓名' style="width: 80%"
42
+ type="text"
43
+ v-model="model.f_user_name">
44
+ </div>
45
+ <div class="form-group col-sm-5" v-show="$parent.$parent.$parent.criteriaShow">
46
+ <!-- <label>用户编号:</label> -->
47
+ <datepicker placeholder="开始日期" style="width:60%"
48
+ v-model="model.startDate"
49
+ :value.sync="model.startDate"
50
+ :format="'yyyy-MM-dd HH:mm:ss'"
51
+ class="datepicker"
52
+ condition="r.f_operate_date >= '{}'"
53
+ :show-reset-button="true"
54
+ >
55
+ </datepicker>
56
+ </div>
57
+ <div class="form-group col-sm-5" v-show="$parent.$parent.$parent.criteriaShow">
58
+ <!-- <label>用户编号:</label> -->
59
+ <datepicker placeholder="结束日期" style="width:60%"
60
+ v-model="model.endDate"
61
+ :value.sync="model.endDate"
62
+ :format="'yyyy-MM-dd HH:mm:ss'"
63
+ class="datepicker"
64
+ condition="r.f_operate_date <= '{}'"
65
+ :show-reset-button="true"
66
+ >
67
+ </datepicker>
68
+ </div>
39
69
  </div>
40
70
  <!-- <partial name="cardcriteria"></partial> -->
41
71
  <!-- <div class="form-group">
package/src/filiale/qianneng/ChangeMeter.vue CHANGED
@@ -238,6 +238,13 @@
238
238
  :options='opentype'
239
239
  close-on-select clear-button></v-select>
240
240
  </div>
241
+ <div class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
242
+ <label class="font_normal_body">新表表向</label>
243
+ <v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
244
+ :value-single="true"
245
+ close-on-select
246
+ v-model='model.f_newaroundmeter'></v-select>
247
+ </div>
241
248
  </div>
242
249
  <div class="row auto" >
243
250
  <div class="col-sm-12"
package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue CHANGED
@@ -166,10 +166,11 @@
166
166
  close-on-select
167
167
  v-el:cc></v-select>
168
168
  </div>
169
- <div class="col-sm-4 form-group">
169
+ <div class="col-sm-4 form-group" :class="[$m.f_aroundmeter.required ? 'select-error' : '']">
170
170
  <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
171
+ <input type="text" v-show="false" v-model="$refs.f_aroundmeter.selectedItems" v-validate:f_aroundmeter='{required: true }'/>
171
172
  <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
172
- v-model='row.f_aroundmeter'></v-select>
173
+ v-model='row.f_aroundmeter' v-ref:f_aroundmeter></v-select>
173
174
  </div>
174
175
  <div class="col-sm-4 form-group" >
175
176
  <label for="f_bqf_type" class="font_normal_body">表前阀型号</label>
package/src/filiale/qianneng/FilesManageNew/MeterinfoTest.vue CHANGED
@@ -123,10 +123,11 @@
123
123
  <!--</div>-->
124
124
  <!--</div>-->
125
125
 
126
- <div class="col-sm-4 form-group">
126
+ <div class="col-sm-4 form-group" :class="[$m.f_aroundmeter.required ? 'select-error' : '']">
127
127
  <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
128
+ <input type="text" v-show="false" v-model="$refs.f_aroundmeter.selectedItems" v-validate:f_aroundmeter='{required: true }'>
128
129
  <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
129
- v-model='row.f_aroundmeter'></v-select>
130
+ v-model='row.f_aroundmeter' v-ref:f_aroundmeter></v-select>
130
131
  </div>
131
132
  <div class="col-sm-4 form-group">
132
133
  <label for="f_gas_person" class="font_normal_body">&ensp;通&ensp;气&ensp;人</label>
package/src/filiale/rongcheng/UserDeviceInfoTest.vue CHANGED
@@ -19,20 +19,21 @@
19
19
  </div>
20
20
  </div>
21
21
  <div class="row auto" style="margin-left: 10px;">
22
- <!-- <div class="col-sm-6 form-group" style="padding-right: 5px;">-->
23
- <!-- <label class="font_normal_body">设备品牌</label>-->
24
- <!-- <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">-->
25
- <!-- </div>-->
22
+ <div class="col-sm-6 form-group" style="padding-right: 5px;">
23
+ <label class="font_normal_body">设备品牌</label>
24
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
25
+ </div>
26
26
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
27
27
  <label class="font_normal_body">安装人&nbsp;&nbsp;&nbsp;</label>
28
28
  <input type="text" class="input_search" style="width:60%" v-model="row.f_instaler_person" placeholder='安装人' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
29
29
  </div>
30
+
31
+ </div>
32
+ <div class="row auto" style="margin-left: 10px;">
30
33
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
31
34
  <label class="font_normal_body">设备型号</label>
32
35
  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_model" placeholder='设备型号' :id="$index+'devicesmodel'">
33
36
  </div>
34
- </div>
35
- <div class="row auto" style="margin-left: 10px;">
36
37
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
37
38
  <label class="font_normal_body">安装日期</label>
38
39
  <datepicker placeholder="安装日期" style="width: 60%"
@@ -41,6 +42,9 @@
41
42
  :format="'yyyy-MM-dd HH:mm:ss'">
42
43
  </datepicker>
43
44
  </div>
45
+ </div>
46
+ <div class="row auto" style="margin-left: 10px;">
47
+
44
48
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
45
49
  <label class="font_normal_body">生产日期</label>
46
50
  <datepicker placeholder="生产日期" style="width: 60%"
@@ -49,12 +53,12 @@
49
53
  :format="'yyyy-MM-dd HH:mm:ss'">
50
54
  </datepicker>
51
55
  </div>
52
- </div>
53
- <div class="row auto" style="margin-left: 10px;">
54
56
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
55
57
  <label class="font_normal_body">设备数量</label>
56
58
  <input type="number" class="input_search" style="width:60%" v-model="row.f_devices_num" placeholder='设备数量' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
57
59
  </div>
60
+ </div>
61
+ <div class="row auto" style="margin-left: 10px;">
58
62
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
59
63
  <label class="font_normal_body">到期日期</label>
60
64
  <datepicker placeholder="到期日期" style="width: 60%"
@@ -63,14 +67,15 @@
63
67
  :format="'yyyy-MM-dd HH:mm:ss'">
64
68
  </datepicker>
65
69
  </div>
66
- </div>
67
- <div class="row auto" style="margin-left: 10px;">
68
70
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
69
71
  <label class="font_normal_body">管道类型</label>
72
+
70
73
  <v-select :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
71
74
  :options='pipetypes' placeholder='连接管类型' :value-single="true"
72
75
  close-on-select></v-select>
73
76
  </div>
77
+ </div>
78
+ <div class="row auto" style="margin-left: 10px;">
74
79
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
75
80
  <label class="font_normal_body">安装日期</label>
76
81
  <datepicker placeholder="连接管安装日期" style="width: 60%"
@@ -79,8 +84,6 @@
79
84
  :format="'yyyy-MM-dd HH:mm:ss'">
80
85
  </datepicker>
81
86
  </div>
82
- </div>
83
- <div class="row auto" style="margin-left: 10px;">
84
87
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
85
88
  <label class="font_normal_body">到期日期</label>
86
89
  <datepicker placeholder="连接管到期日期" style="width: 60%"
@@ -89,16 +92,16 @@
89
92
  :format="'yyyy-MM-dd HH:mm:ss'">
90
93
  </datepicker>
91
94
  </div>
95
+ </div>
96
+ <div class="row auto" style="margin-left: 10px;">
92
97
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
93
98
  <label class="font_normal_body">钢管连接</label>
94
99
  <input type="text" class="input_search" style="width:60%" v-model="row.f_pipe_connection" placeholder='设备型号' :id="$index+'devicesmodel'">
95
100
  </div>
96
101
  </div>
97
102
  <div class="row auto" style="margin-left: 10px;">
98
- </div>
99
- <div class="row auto" style="margin-left: 10px;">
100
- <div style="" class="col-sm-8 form-group">
101
- <label for="f_comments" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;注</label>
103
+ <div style="" class="col-sm-12 form-group">
104
+ <label for="f_comments" class="font_normal_body ">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
102
105
  <input class="input_search" style="width:80%" v-model="row.f_comments"/>
103
106
  </div>
104
107
  </div>