sale-client 3.6.132 → 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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.132",
3
+ "version": "3.6.134",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -10,7 +10,7 @@
10
10
  <label class="font_normal_body">开始时间</label>
11
11
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
12
12
  class="datepicker"
13
- condition="f_changemeter_date >= '{} 00:00:00' "
13
+ condition="f_operate_date >= '{} 00:00:00' "
14
14
  placeholder="起始时间"
15
15
  style="width:60%"
16
16
  v-model="model.f_start_date"
@@ -20,7 +20,7 @@
20
20
  <label class="font_normal_body" >结束时间</label>
21
21
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
22
22
  class="datepicker"
23
- condition="f_changemeter_date <= '{} 23:59:59'"
23
+ condition="f_operate_date <= '{} 23:59:59'"
24
24
  placeholder="结束时间"
25
25
  style="width:60%"
26
26
  v-model="model.f_end_date"
@@ -28,12 +28,12 @@
28
28
  </div>
29
29
  <div class="col-sm-2 form-group">
30
30
  <label class="font_normal_body">换表类型</label>
31
- <v-select :options='$parent.$parent.changeType' :value.sync="model.f_change_type"
31
+ <v-select :options='$parent.$parent.changeType' :value.sync="model.f_type"
32
32
  close-on-select
33
- condition="f_change_type='{}'"
33
+ condition="f_type='{}'"
34
34
  placeholder='换表类型'
35
35
  style="width:60%"
36
- v-model="model.f_change_type"
36
+ v-model="model.f_type"
37
37
  ></v-select>
38
38
  </div>
39
39
  <div class="col-sm-2 form-group">
@@ -92,7 +92,6 @@
92
92
  radio: [],
93
93
  // 选中的页
94
94
  all: [],
95
- searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
96
95
  // row数据
97
96
  rowsdata: [],
98
97
  fields: {'f_userinfo_code': '用户编号',
@@ -127,7 +126,7 @@
127
126
  },
128
127
  methods: {
129
128
  async search () {
130
- this.condition = `i.${this.searchValue} = '${this.row[this.searchValue]}' and u.f_orgid = '${this.$login.f.orgid}' and ${this.$refs.paged.$refs.criteria.condition}`
129
+ this.condition = `i.f_userinfo_id = '${this.row.f_userinfo_id}' and u.f_orgid = '${this.$login.f.orgid}' and ${this.$refs.paged.$refs.criteria.condition}`
131
130
  this.model.search(this.condition, this.model)
132
131
  let http = new HttpResetClass()
133
132
  let res = await http.load('POST', 'rs/sql/getChangeRecord', {
@@ -99,7 +99,7 @@
99
99
  }, ...this.$appdata.getParam('是否有效')] : [],
100
100
  // row数据
101
101
  rowsdata: [],
102
- searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
102
+
103
103
  fields: {'f_userinfo_code': '客户编号', 'f_user_name': '原用户姓名', 'f_newuser_name': '新用户姓名', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'},
104
104
  defaultfield: [
105
105
  'f_userinfo_code', 'f_user_name', 'f_newuser_name', 'f_transfer_fees', 'f_operate_date'
@@ -115,7 +115,7 @@
115
115
  },
116
116
  methods: {
117
117
  async search () {
118
- this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
118
+ this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userinfo_id = '${this.row.f_userinfo_id}' and f_orgid = '${this.$login.f.orgid}'`
119
119
  this.model.search(this.condition, this.model)
120
120
  let http = new HttpResetClass()
121
121
  let res = await http.load('POST', 'rs/sql/sale_TransferQuery', {
@@ -181,7 +181,7 @@
181
181
  'f_card_id': '卡号',
182
182
  'f_user_phone': '电话',
183
183
  'f_address': '地址',
184
- 'f_offsite_time': '安检日期',
184
+ 'f_last_check_date': '安检日期',
185
185
  'f_parameter_value': '限购日期',
186
186
  'f_comments': '限购原因'
187
187
  }
@@ -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;">
@@ -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"/>-->
@@ -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>
@@ -10,7 +10,7 @@
10
10
  <label class="font_normal_body">开始时间</label>
11
11
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
12
12
  class="datepicker"
13
- condition="f_changemeter_date >= '{} 00:00:00' "
13
+ condition="f_operate_date >= '{} 00:00:00' "
14
14
  placeholder="起始时间"
15
15
  style="width:60%"
16
16
  v-model="model.f_start_date"
@@ -20,7 +20,7 @@
20
20
  <label class="font_normal_body" >结束时间</label>
21
21
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
22
22
  class="datepicker"
23
- condition="f_changemeter_date <= '{} 23:59:59'"
23
+ condition="f_operate_date <= '{} 23:59:59'"
24
24
  placeholder="结束时间"
25
25
  style="width:60%"
26
26
  v-model="model.f_end_date"
@@ -28,12 +28,12 @@
28
28
  </div>
29
29
  <div class="col-sm-2 form-group">
30
30
  <label class="font_normal_body">换表类型</label>
31
- <v-select :options='$parent.$parent.changeType' :value.sync="model.f_change_type"
31
+ <v-select :options='$parent.$parent.changeType' :value.sync="model.f_type"
32
32
  close-on-select
33
- condition="f_change_type='{}'"
33
+ condition="f_type='{}'"
34
34
  placeholder='换表类型'
35
35
  style="width:60%"
36
- v-model="model.f_change_type"
36
+ v-model="model.f_type"
37
37
  ></v-select>
38
38
  </div>
39
39
  <div class="col-sm-2 form-group">
@@ -76,10 +76,10 @@
76
76
  <datepicker placeholder="开始日期"
77
77
  style="width:60%"
78
78
  class="datepicker"
79
- v-model="model.f_offsite_time"
80
- :value.sync="model.f_offsite_time"
79
+ v-model="model.f_last_check_date"
80
+ :value.sync="model.f_last_check_date"
81
81
  :format="'yyyy-MM-dd'"
82
- condition="f_offsite_time >= '{} 00:00:00'"
82
+ condition="f_last_check_date >= '{} 00:00:00'"
83
83
  ></datepicker>
84
84
  </div>
85
85
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
@@ -117,7 +117,7 @@
117
117
  <td style="text-align: center;">{{row.f_user_name}}</td>
118
118
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_user_phone}}</td>
119
119
  <td style="text-align: center;">{{row.f_address}}</td>
120
- <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_offsite_time}}</td>
120
+ <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_last_check_date}}</td>
121
121
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
122
122
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_comments}}</td>
123
123
  </template>
@@ -149,7 +149,7 @@
149
149
  'f_user_name': '姓名',
150
150
  'f_user_phone': '电话',
151
151
  'f_address': '地址',
152
- 'f_offsite_time': '安检日期',
152
+ 'f_last_check_date': '安检日期',
153
153
  'f_parameter_value': '限购日期',
154
154
  'f_comments': '限购原因'
155
155
  }
@@ -94,10 +94,10 @@
94
94
  <datepicker placeholder="开始日期"
95
95
  style="width:60%"
96
96
  class="datepicker"
97
- v-model="model.f_offsite_time"
98
- :value.sync="model.f_offsite_time"
97
+ v-model="model.f_last_check_date"
98
+ :value.sync="model.f_last_check_date"
99
99
  :format="'yyyy-MM-dd'"
100
- condition="f_offsite_time >= '{} 00:00:00'"
100
+ condition="f_last_check_date >= '{} 00:00:00'"
101
101
  ></datepicker>
102
102
  </div>
103
103
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
@@ -139,7 +139,7 @@
139
139
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_card_id}}</td>
140
140
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_user_phone}}</td>
141
141
  <td style="text-align: center;">{{row.f_address}}</td>
142
- <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_offsite_time}}</td>
142
+ <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_last_check_date}}</td>
143
143
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
144
144
  <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_comments}}</td>
145
145
  </template>
@@ -173,7 +173,7 @@
173
173
  'f_card_id': '卡号',
174
174
  'f_user_phone': '电话',
175
175
  'f_address': '地址',
176
- 'f_offsite_time': '安检日期',
176
+ 'f_last_check_date': '安检日期',
177
177
  'f_parameter_value': '限购日期',
178
178
  'f_comments': '限购原因'
179
179
  }
@@ -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