manage-client 3.2.71 → 3.2.74

package/src/components/sale/businessquery/HandplanQuery.vue

@@ -62,6 +62,22 @@
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄表状态</label>
+                  <v-select :value.sync="model.f_meter_state"
+                            v-model="model.f_meter_state"
+                            :options='$parent.$parent.meterstate' placeholder='请选择'
+                            condition="f_meter_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表单状态</label>
+                  <v-select :value.sync="model.f_hand_state"
+                            v-model="model.f_hand_state"
+                            :options='$parent.$parent.handstate' placeholder='请选择'
+                            condition="f_hand_state = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -92,42 +108,27 @@
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄表状态</label>
-                  <v-select :value.sync="model.f_meter_state"
-                            v-model="model.f_meter_state"
-                            :options='$parent.$parent.meterstate' placeholder='请选择'
-                            condition="f_meter_state = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表单状态</label>
-                  <v-select :value.sync="model.f_hand_state"
-                            v-model="model.f_hand_state"
-                            :options='$parent.$parent.handstate' placeholder='请选择'
-                            condition="f_hand_state = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">录入人员</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"
-                         condition="f_input_person like '%{}%'" placeholder='录入人员'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">是否缴费</label>
-                  <v-select :value.sync="model.f_whether_pay"
-                            v-model="model.f_whether_pay"
-                            :options='$parent.$parent.whetherPay' placeholder='请选择'
-                            condition="f_whether_pay = '{}'"
-                            close-on-select></v-select>
+                  <label for="startDate" class="font_normal_body">审核日期</label>
+                  <datepicker id="f_audit_date" placeholder="开始日期" style="width:60%"
+                              v-model="model.auditStartDate"
+                              :value.sync="model.auditStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_audit_date >= '{}'">
+                  </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
-                  <v-select :value.sync="model.f_bgl"
-                            v-model="model.f_bgl"
-                            :options='$parent.$parent.bgl' placeholder='请选择'
-                            condition="f_bgl = '{}'"
-                            close-on-select></v-select>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"
+                              v-model="model.auditEndDate"
+                              :value.sync="model.auditEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_audit_date <= '{}'">
+                  </datepicker>
                 </div>
+
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -158,12 +159,26 @@
                             condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
+
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">下账状态</label>
-                  <v-select :value.sync="model.f_accounts_state"
-                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
-                            condition="f_accounts_state = '{}'"
-                            close-on-select></v-select>
+                  <label for="startDate" class="font_normal_body">下发日期</label>
+                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.handStartDate"
+                              :value.sync="model.handStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_hand_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.handEndDate"
+                              :value.sync="model.handEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_hand_date <= '{}'">
+                  </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
@@ -198,23 +213,23 @@
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">下发日期</label>
+                  <label for="startDate" class="font_normal_body">收费日期</label>
                   <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.handStartDate"
-                              :value.sync="model.handStartDate"
+                              v-model="model.sellStartDate"
+                              :value.sync="model.sellStartDate"
                               :format="'yyyy-MM-dd 00:00:00'"
                               :show-reset-button="true"
-                              condition="f_hand_date >= '{}'">
+                              condition="f_sellinggas_operate_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.handEndDate"
-                              :value.sync="model.handEndDate"
+                              v-model="model.sellEndDate"
+                              :value.sync="model.sellEndDate"
                               :format="'yyyy-MM-dd 23:59:59'"
                               :show-reset-button="true"
-                              condition="f_hand_date <= '{}'">
+                              condition="f_sellinggas_operate_date <= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -246,6 +261,19 @@
                             close-on-select
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                <label class="font_normal_body">录入人员</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"
+                       condition="f_input_person like '%{}%'" placeholder='录入人员'>
+              </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">是否缴费</label>
+                  <v-select :value.sync="model.f_whether_pay"
+                            v-model="model.f_whether_pay"
+                            :options='$parent.$parent.whetherPay' placeholder='请选择'
+                            condition="f_whether_pay = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group" >
                   <label for="belongmonth" class="font_normal_body" >所属年月</label>
                   <datepicker placeholder="所属年月" style="width:60%"
@@ -265,25 +293,21 @@
                             close-on-select
                             condition="f_bank_name = '{}'"></v-select>
                 </div>
+
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">收费日期</label>
-                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.sellStartDate"
-                              :value.sync="model.sellStartDate"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date >= '{}'">
-                  </datepicker>
+                  <label class="font_normal_body">下账状态</label>
+                  <v-select :value.sync="model.f_accounts_state"
+                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
+                            condition="f_accounts_state = '{}'"
+                            close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.sellEndDate"
-                              :value.sync="model.sellEndDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date <= '{}'">
-                  </datepicker>
+                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
+                  <v-select :value.sync="model.f_bgl"
+                            v-model="model.f_bgl"
+                            :options='$parent.$parent.bgl' placeholder='请选择'
+                            condition="f_bgl = '{}'"
+                            close-on-select></v-select>
                 </div>
               </div>
             </div>
@@ -319,6 +343,9 @@
                 <th>
                   <nobr>数据年月</nobr>
                 </th>
+                <th>
+                  <nobr>审核日期</nobr>
+                </th>
                 <th>
                   <nobr>上期底数</nobr>
                 </th>
@@ -464,6 +491,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.ym_data}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_audit_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_last_tablebase}}</nobr>
               </td>

package/src/components/sale/config/exportConfig.js

@@ -259,7 +259,7 @@ export default{
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '滞纳金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
     'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额',
     'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
-    'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',