manage-client 3.2.73 → 3.2.76

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": "manage-client",
3
- "version": "3.2.73",
3
+ "version": "3.2.76",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -104,6 +104,12 @@
104
104
  <th>
105
105
  <nobr>减免金额</nobr>
106
106
  </th>
107
+ <th>
108
+ <nobr>优惠前金额</nobr>
109
+ </th>
110
+ <th>
111
+ <nobr>优惠后金额</nobr>
112
+ </th>
107
113
  <th>
108
114
  <nobr>备注</nobr>
109
115
  </th>
@@ -141,6 +147,12 @@
141
147
  <td style="text-align: center;">
142
148
  <nobr>{{0-row.f_latefee_ought}}</nobr>
143
149
  </td>
150
+ <td style="text-align: center;">
151
+ <nobr>{{row.f_overdue.toFixed(2)}}</nobr>
152
+ </td>
153
+ <td style="text-align: center;">
154
+ <nobr>{{(row.f_overdue.toFixed(2)-(0-row.f_latefee_ought.toFixed(2))).toFixed(2)}}</nobr>
155
+ </td>
144
156
  <td style="text-align: center;">
145
157
  <nobr>{{row.f_comments}}</nobr>
146
158
  </td>
@@ -180,6 +180,9 @@
180
180
  <th style="text-align:center"><nobr>指令生成时间</nobr></th>
181
181
  <th style="text-align:center"><nobr>指令发送时间</nobr></th>
182
182
  <th style="text-align:center"><nobr>上表时间</nobr></th>
183
+ <th style="text-align:center">
184
+ <nobr>充值金额</nobr>
185
+ </th>
183
186
  <th style="text-align:center">
184
187
  <nobr>操作内容</nobr>
185
188
  </th>
@@ -239,6 +242,9 @@
239
242
  </td>
240
243
  <td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
241
244
  <td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
245
+ <th style="text-align:center">
246
+ <nobr>{{row.f_collection}}</nobr>
247
+ </th>
242
248
  <td style="text-align:center">
243
249
  <nobr>{{row.note}}</nobr>
244
250
  </td>
@@ -241,11 +241,11 @@
241
241
  condition="f_house_type = '{}'"></v-select>
242
242
  </div>
243
243
  <div class="col-sm-2 form-group">
244
- <label class="font_normal_body" >缴费类型</label>
244
+ <label class="font_normal_body" >报装类型</label>
245
245
  <v-select :value.sync="model.f_payment" multiple
246
246
  v-model="model.f_payment"
247
247
  :options='$parent.$parent.dypayment' placeholder='请选择'
248
- condition="f_cost_type in {}"
248
+ condition="f_bz_type in {}"
249
249
  close-on-select></v-select>
250
250
  </div>
251
251
  <div class="col-sm-2 form-group" >
@@ -672,7 +672,7 @@
672
672
  // 合计数据
673
673
  sumsmodel: {},
674
674
  pricenames:[],
675
- dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
675
+ dypayment:this.$appdata.getParam('报装类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('报装类型')] : [],
676
676
  }
677
677
  },
678
678
  ready(){
@@ -236,6 +236,26 @@
236
236
  condition="f_createfile_date <= '{} 23:59:59'">
237
237
  </datepicker>
238
238
  </div>
239
+ <div class="col-sm-2 form-group">
240
+ <label for="startDate" class="font_normal_body">开户开始日期</label>
241
+ <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
242
+ v-model="model.startDate1"
243
+ :value.sync="model.startDate1"
244
+ :format="'yyyy-MM-dd'"
245
+ :show-reset-button="true"
246
+ condition="f_open_date >= '{} 00:00:00'">
247
+ </datepicker>
248
+ </div>
249
+ <div class="col-sm-2 form-group">
250
+ <label for="endDate" class="font_normal_body">开户结束日期</label>
251
+ <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
252
+ v-model="model.endDate1"
253
+ :value.sync="model.endDate1"
254
+ :format="'yyyy-MM-dd'"
255
+ :show-reset-button="true"
256
+ condition="f_open_date <= '{} 23:59:59'">
257
+ </datepicker>
258
+ </div>
239
259
  <div
240
260
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
241
261
  class="form-group">
@@ -318,6 +338,9 @@
318
338
  <th>
319
339
  <nobr>建档日期</nobr>
320
340
  </th>
341
+ <th>
342
+ <nobr>开户日期</nobr>
343
+ </th>
321
344
  <th>
322
345
  <nobr>建档人</nobr>
323
346
  </th>
@@ -393,6 +416,9 @@
393
416
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
394
417
  <nobr>{{row.f_createfile_date}}</nobr>
395
418
  </td>
419
+ <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
420
+ <nobr>{{row.f_open_date}}</nobr>
421
+ </td>
396
422
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
397
423
  <nobr>{{row.f_createfile_person}}</nobr>
398
424
  </td>