sale-client 3.6.351 → 3.6.352

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/meihekou/MbpeopleList.vue +24 -11
  3. package/src/filiale/meihekou/batch/batchEditManage.vue +4 -5
  4. package/src/filiale/meihekou/batch/batchEditOperate.vue +1 -1
  5. package/src/filiale/meihekou/batch/batchUserList.vue +9 -3
  6. package/src/filiale/yangchun/BlackList/BlackList.vue +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.351",
3
+ "version": "3.6.352",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/meihekou/MbpeopleList.vue CHANGED
@@ -14,7 +14,16 @@
14
14
  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
15
15
  condition="f_user_name like '%{}%'" placeholder='用户姓名'>
16
16
  </div>
17
-
17
+ <div class="col-sm-3 form-group">
18
+ <label class="font_normal_body">小&emsp;区&emsp;</label>
19
+ <input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
20
+ condition=" f_residential_area like '{}%'" placeholder="输入小区">
21
+ </div>
22
+ <div class="col-sm-3 form-group">
23
+ <label class="font_normal_body">楼&emsp;号&emsp;</label>
24
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_building"
25
+ condition="f_building = '{}'" placeholder='楼号'>
26
+ </div>
18
27
  <div class="form-group button-range" style="float: right">
19
28
  <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
20
29
  <button class="button_clear button_spacing" @click="clear">清空</button>
@@ -109,21 +118,13 @@
109
118
  condition="f_meter_brand in {}"
110
119
  close-on-select></v-select>
111
120
  </div>
112
- <div class="col-sm-3 form-group">
113
- <label class="font_normal_body">小&emsp;区&emsp;</label>
114
- <input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
115
- condition=" f_residential_area like '{}%'" placeholder="输入小区">
116
- </div>
121
+
117
122
  <div class="form-group col-sm-3">
118
123
  <label class="font_normal_body">客户地址</label>
119
124
  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
120
125
  condition="f_address like '%{}%'" placeholder='客户地址'>
121
126
  </div>
122
- <div class="col-sm-3 form-group">
123
- <label class="font_normal_body">楼&emsp;号&emsp;</label>
124
- <input type="text" class="input_search" style="width:60%" v-model="model.f_building"
125
- condition="f_building = '{}'" placeholder='楼号'>
126
- </div>
127
+
127
128
  <div class="form-group col-sm-3">
128
129
  <label class="font_normal_body">组织机构</label>
129
130
  <res-select :initresid='$parent.$parent.curorgid'
@@ -195,6 +196,12 @@
195
196
  <th>
196
197
  <nobr>客户地址</nobr>
197
198
  </th>
199
+ <th>
200
+ <nobr>小区</nobr>
201
+ </th>
202
+ <th>
203
+ <nobr>楼号</nobr>
204
+ </th>
198
205
  <th>
199
206
  <nobr>表号</nobr>
200
207
  </th>
@@ -240,6 +247,12 @@
240
247
  <td>
241
248
  <nobr>{{ row.f_address }}</nobr>
242
249
  </td>
250
+ <td>
251
+ <nobr>{{ row.f_residential_area }}</nobr>
252
+ </td>
253
+ <td>
254
+ <nobr>{{ row.f_building }}</nobr>
255
+ </td>
243
256
  <td>
244
257
  <nobr>{{ row.f_meternumber }}</nobr>
245
258
  </td>
package/src/filiale/meihekou/batch/batchEditManage.vue CHANGED
@@ -1,9 +1,7 @@
1
1
  <template>
2
- <div class="row binary">
3
- <div class="binary-left" style="height:98%">
4
- <batch-user-list @select-changed="selected" v-ref:userlist @save="save"></batch-user-list>
5
- </div>
6
- <div class="binary-right" >
2
+ <div id="unit" class="flex-row">
3
+ <batch-user-list :class="{'basic-main': !isdetail,'binary-left': isdetail}" style="width: auto;" v-ref:userlist @save="save"></batch-user-list>
4
+ <div class="binary-right" style="overflow-y: auto;" v-if="isdetail" style="width: 50%">
7
5
  <batch-edit-operate v-ref:editoperate @batchedit="batchedit" :info='pinfo'></batch-edit-operate>
8
6
  </div>
9
7
  </div>
@@ -28,6 +26,7 @@
28
26
  rowsdata: [],
29
27
  files: {},
30
28
  pinfo: {},
29
+ isdetail: true,
31
30
  chinesename: {
32
31
  files: {
33
32
  'f_inputtor': '抄表员',
package/src/filiale/meihekou/batch/batchEditOperate.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div style="padding-right:25px;padding-left: 20px;">
2
+ <div style="padding-right:25px;padding-left: 20px;" class="auto">
3
3
  <!--分配状态是全部-->
4
4
  <tabset >
5
5
  <tab header="表档案">
package/src/filiale/meihekou/batch/batchUserList.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <div class="flex-row" >
3
- <div style="flex: 1.5" class="flex">
2
+ <div style="flex: 1" class="flex" >
3
+ <div>
4
4
  <div class="flex">
5
5
  <criteria-paged :model="model" v-ref:paged>
6
6
  <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
@@ -134,6 +134,9 @@
134
134
  <th><nobr>地址信息</nobr></th>
135
135
  <th><nobr>客户状态</nobr></th>
136
136
 
137
+ <th><nobr>小区</nobr></th>
138
+ <th><nobr>楼号</nobr></th>
139
+
137
140
  <th><nobr>客户类型</nobr></th>
138
141
  <th><nobr>使用状态</nobr></th>
139
142
  <th><nobr>气表状态</nobr></th>
@@ -161,6 +164,9 @@
161
164
  <td style="text-align: center;">{{row.f_address_detail ? row.f_address + row.f_address_detail : row.f_address}}</td>
162
165
  <td style="text-align: center;">{{row.f_user_state}}</td>
163
166
 
167
+ <td style="text-align: center;">{{row.f_residential_area}}</td>
168
+ <td style="text-align: center;">{{row.f_building}}</td>
169
+
164
170
  <td style="text-align: center;">{{row.f_user_type}}</td>
165
171
  <td style="text-align: center;">{{row.f_usestate}}</td>
166
172
  <td style="text-align: center;">{{row.f_table_state}}</td>
@@ -219,7 +225,7 @@
219
225
  all: [],
220
226
  // 控制单选
221
227
  radio: [],
222
- criteriaShow: false,
228
+ criteriaShow: true,
223
229
  meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '卡表', value: '卡表'}, {label: '物联网表', value: '物联网表'}],
224
230
  adjustables: [],
225
231
  bookSliceArea: []
package/src/filiale/yangchun/BlackList/BlackList.vue CHANGED
@@ -178,7 +178,7 @@
178
178
  self.model.f_userinfo_code = res.data[0].f_userinfo_code
179
179
  self.model.f_function = self.model.f_function?self.model.f_function:[]
180
180
  if(self.model.f_function && typeof (self.model.f_function)==="string"){
181
- self.model.f_function = JSON.parse(self.model.f_function )
181
+ self.model.f_function = JSON.parse(self.model.f_function)
182
182
  }
183
183
  self.model.f_meternumber = res.data[0].f_meternumber
184
184
  self.model.f_card_id = res.data[0].f_card_id
@@ -290,6 +290,7 @@
290
290
  console.log(res.data[0])
291
291
  this.model = res.data[0]
292
292
  this.$parent.blodid = this.model.f_userinfo_id
293
+ this.model.f_function = this.model.f_function ? JSON.parse(this.model.f_function) : []
293
294
  })
294
295
  },
295
296
  async confirm (type) {