manage-client 3.2.88 → 3.2.91-1

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

@@ -13,7 +13,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
+                              condition="f_install_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -23,7 +23,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
+                              condition="f_install_date <= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group ">
@@ -240,8 +240,11 @@
                 </th>
                 <th>
 <!--                  <nobr>换表日期</nobr>-->
-                  <data-order field="f_operate_date" name="换表日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <data-order field="f_install_date" name="换表日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_install_date"></data-order>
+                </th>
+                <th>
+                                    <nobr>操作日期</nobr>
                 </th>
                 <th>
                   <nobr>人员</nobr>
@@ -314,6 +317,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_state}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_install_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
@@ -430,7 +436,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_install_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -443,12 +449,12 @@
           user:[],
         },
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state','f_install_date', 'f_operate_date']
         },
         //排序
-        orderitem:'f_operate_date desc',
+        orderitem:'f_install_date desc',
         orderFields: {
-          f_operate_date: 'no'
+          f_install_date: 'no'
         },
         show:false,
         rowdata:{},
@@ -643,7 +649,7 @@
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+          orderitem: this.orderitem?`${this.orderitem}`: " f_install_date desc"}
       },
       getfield() {
         return exportConfig.changemeterConfig

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

@@ -335,6 +335,9 @@
                   <nobr>片区</nobr>
                 </th>
                 <th>
+                  <nobr>小区</nobr>
+                </th>
+                <th>
 <!--                  <nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -527,6 +530,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_zones}}</nobr>
               </td>
+              <td style="text-align: center;"><nobr>
+                <nobr>{{row.f_residential_area}}</nobr>
+              </nobr> </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>