sale-client 3.6.133 → 3.6.134

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue +19 -14
  3. package/src/filiale/rongcheng/MeterinfoTest.vue +5 -5
  4. package/src/filiale/rongcheng/UserDeviceInfoTest.vue +14 -17
  5. package/src/plugins/FileManageService.js +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.133",
3
+ "version": "3.6.134",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue CHANGED
@@ -24,24 +24,22 @@
24
24
  <label class=" font_normal_body">设备编号</label>
25
25
  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_no" placeholder='设备编号' v-next-el="{id: $index+'brand'}">
26
26
  </div>
27
- <div class="col-sm-6 form-group" style="padding-right: 5px;">
28
- <label class="font_normal_body">设备品牌</label>
29
- <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
30
- </div>
31
- </div>
32
- <div class="row auto" style="margin-left: 10px;">
27
+ <!-- <div class="col-sm-6 form-group" style="padding-right: 5px;">-->
28
+ <!-- <label class="font_normal_body">设备品牌</label>-->
29
+ <!-- <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">-->
30
+ <!-- </div>-->
33
31
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
34
32
  <label class="font_normal_body">设备型号</label>
35
33
  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_model"
36
34
  placeholder='设备型号' :id="$index+'devicesmodel'">
37
35
  </div>
36
+ </div>
37
+ <div class="row auto" style="margin-left: 10px;">
38
38
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
39
39
  <label class="font_normal_body">&nbsp;安&nbsp;装&nbsp;人&nbsp;</label>
40
40
  <input type="text" class="input_search" style="width:60%" v-model="row.f_instaler_person"
41
41
  placeholder='安装人' v-next-el="{id: $index+'f_instaler_person'}" :id="$index+'brand'">
42
42
  </div>
43
- </div>
44
- <div class="row auto" style="margin-left: 10px;">
45
43
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
46
44
  <label class="font_normal_body">生产日期</label>
47
45
  <datepicker placeholder="生产日期" style="width: 60%"
@@ -50,6 +48,8 @@
50
48
  :format="'yyyy-MM-dd HH:mm:ss'">
51
49
  </datepicker>
52
50
  </div>
51
+ </div>
52
+ <div class="row auto" style="margin-left: 10px;">
53
53
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
54
54
  <label class="font_normal_body">安装日期</label>
55
55
  <datepicker placeholder="安装日期" style="width: 60%"
@@ -59,13 +59,13 @@
59
59
  :format="'yyyy-MM-dd HH:mm:ss'">
60
60
  </datepicker>
61
61
  </div>
62
- </div>
63
- <div class="row auto" style="margin-left: 10px;">
64
62
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
65
63
  <label class="font_normal_body">设备数量</label>
66
64
  <input type="number" class="input_search" style="width:60%" v-model="row.f_devices_num"
67
65
  placeholder='设备数量' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
68
66
  </div>
67
+ </div>
68
+ <div class="row auto" style="margin-left: 10px;">
69
69
  <div class="col-sm-6 form-group" style="padding-right: 5px;" v-show="row.f_devices_type == '报警器'">
70
70
  <label class="font_normal_body">首校日期</label>
71
71
  <datepicker placeholder="首校日期" style="width: 60%"
@@ -88,8 +88,6 @@
88
88
  :format="'yyyy-MM-dd HH:mm:ss'">
89
89
  </datepicker>
90
90
  </div>
91
- </div>
92
- <div class="row auto" style="margin-left: 10px;">
93
91
  <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type == '报警器' && devicesinfoShow">
94
92
  <label class="font_normal_body">报废日期</label>
95
93
  <datepicker placeholder="报废日期" style="width: 60%"
@@ -107,9 +105,16 @@
107
105
  </datepicker>
108
106
  </div>
109
107
  <div class="col-sm-6 form-group" style="padding-right: 5px;" v-show="row.f_devices_type == '调压器'">
110
- <label class="font_normal_body">压力范围</label>
108
+ <label class="font_normal_body">出口压力</label>
111
109
  <input type="text" class="input_search" style="width:60%" v-model="row.f_pressure_range"
112
- placeholder='压力范围' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
110
+ placeholder='出口压力' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
111
+ </div>
112
+ </div>
113
+ <div class="row auto" style="margin-left: 10px;">
114
+ <div class="col-sm-6 form-group" style="padding-right: 5px;" v-show="row.f_devices_type == '调压器'">
115
+ <label class="font_normal_body">进口压力</label>
116
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_import_pressure"
117
+ placeholder='进口压力' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
113
118
  </div>
114
119
  </div>
115
120
  <div class="row auto" style="margin-left: 10px;">
package/src/filiale/rongcheng/MeterinfoTest.vue CHANGED
@@ -42,11 +42,11 @@
42
42
  <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_model" placeholder='流量计型号'
43
43
  v-next-el="{id: 'meterbase'}">
44
44
  </div>
45
- <div class="col-sm-4 form-group" >
46
- <label for="f_llj_meternumber" class="font_normal_body">流量计表号</label>
47
- <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_meternumber"
48
- placeholder='表号'>
49
- </div>
45
+ <!-- <div class="col-sm-4 form-group" >-->
46
+ <!-- <label for="f_llj_meternumber" class="font_normal_body">流量计表号</label>-->
47
+ <!-- <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_meternumber"-->
48
+ <!-- placeholder='表号'>-->
49
+ <!-- </div>-->
50
50
  <!-- <div style="" class="col-sm-8 form-group">-->
51
51
  <!-- <label for="f_llj_address" class="font_normal_body ">流量计位置</label>-->
52
52
  <!-- <input class="input_search" style="width:80%" placeholder='流量计安装位置' v-model="row.f_llj_address"/>-->
package/src/filiale/rongcheng/UserDeviceInfoTest.vue CHANGED
@@ -19,21 +19,20 @@
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;">
33
30
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
34
31
  <label class="font_normal_body">设备型号</label>
35
32
  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_model" placeholder='设备型号' :id="$index+'devicesmodel'">
36
33
  </div>
34
+ </div>
35
+ <div class="row auto" style="margin-left: 10px;">
37
36
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
38
37
  <label class="font_normal_body">安装日期</label>
39
38
  <datepicker placeholder="安装日期" style="width: 60%"
@@ -42,9 +41,6 @@
42
41
  :format="'yyyy-MM-dd HH:mm:ss'">
43
42
  </datepicker>
44
43
  </div>
45
- </div>
46
- <div class="row auto" style="margin-left: 10px;">
47
-
48
44
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
49
45
  <label class="font_normal_body">生产日期</label>
50
46
  <datepicker placeholder="生产日期" style="width: 60%"
@@ -53,12 +49,12 @@
53
49
  :format="'yyyy-MM-dd HH:mm:ss'">
54
50
  </datepicker>
55
51
  </div>
52
+ </div>
53
+ <div class="row auto" style="margin-left: 10px;">
56
54
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
57
55
  <label class="font_normal_body">设备数量</label>
58
56
  <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'">
59
57
  </div>
60
- </div>
61
- <div class="row auto" style="margin-left: 10px;">
62
58
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
63
59
  <label class="font_normal_body">到期日期</label>
64
60
  <datepicker placeholder="到期日期" style="width: 60%"
@@ -67,15 +63,14 @@
67
63
  :format="'yyyy-MM-dd HH:mm:ss'">
68
64
  </datepicker>
69
65
  </div>
66
+ </div>
67
+ <div class="row auto" style="margin-left: 10px;">
70
68
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
71
69
  <label class="font_normal_body">管道类型</label>
72
-
73
70
  <v-select :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
74
71
  :options='pipetypes' placeholder='连接管类型' :value-single="true"
75
72
  close-on-select></v-select>
76
73
  </div>
77
- </div>
78
- <div class="row auto" style="margin-left: 10px;">
79
74
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
80
75
  <label class="font_normal_body">安装日期</label>
81
76
  <datepicker placeholder="连接管安装日期" style="width: 60%"
@@ -84,6 +79,8 @@
84
79
  :format="'yyyy-MM-dd HH:mm:ss'">
85
80
  </datepicker>
86
81
  </div>
82
+ </div>
83
+ <div class="row auto" style="margin-left: 10px;">
87
84
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
88
85
  <label class="font_normal_body">到期日期</label>
89
86
  <datepicker placeholder="连接管到期日期" style="width: 60%"
@@ -92,13 +89,13 @@
92
89
  :format="'yyyy-MM-dd HH:mm:ss'">
93
90
  </datepicker>
94
91
  </div>
95
- </div>
96
- <div class="row auto" style="margin-left: 10px;">
97
92
  <div class="col-sm-6 form-group" style="padding-right: 5px;">
98
93
  <label class="font_normal_body">钢管连接</label>
99
94
  <input type="text" class="input_search" style="width:60%" v-model="row.f_pipe_connection" placeholder='设备型号' :id="$index+'devicesmodel'">
100
95
  </div>
101
96
  </div>
97
+ <div class="row auto" style="margin-left: 10px;">
98
+ </div>
102
99
  <div class="row auto" style="margin-left: 10px;">
103
100
  <div style="" class="col-sm-8 form-group">
104
101
  <label for="f_comments" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;注</label>
package/src/plugins/FileManageService.js CHANGED
@@ -300,6 +300,7 @@ let FileManageService = {
300
300
  userfilesdevice.f_manufactor = userfilesdevice.f_manufactor ? userfilesdevice.f_manufactor : null
301
301
  userfilesdevice.f_rate_flow = userfilesdevice.f_rate_flow ? userfilesdevice.f_rate_flow : null
302
302
  userfilesdevice.f_pressure_range = userfilesdevice.f_pressure_range ? userfilesdevice.f_pressure_range : null
303
+ userfilesdevice.f_import_pressure = userfilesdevice.f_import_pressure ? userfilesdevice.f_import_pressure : null
303
304
  userfilesdevice.f_firstcheck_date = userfilesdevice.f_firstcheck_date ? userfilesdevice.f_firstcheck_date : null
304
305
  userfilesdevice.f_nextcheck_date = userfilesdevice.f_nextcheck_date ? userfilesdevice.f_nextcheck_date : null
305
306
  userfilesdevice.f_comments = userfilesdevice.f_comments ? userfilesdevice.f_comments : null