manage-client 3.2.122 → 3.2.125

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

@@ -8,7 +8,7 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
                 <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="startDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
@@ -18,7 +18,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
@@ -165,20 +165,50 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_classify" multiple
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
-                            condition="f_meter_classify in {}"
-                            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_meter_brand" multiple
-                            v-model="model.f_meter_brand"
-                            :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand in {}"
-                            close-on-select></v-select>
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">气表类型</label>-->
+                  <!--<v-select :value.sync="model.f_meter_classify" multiple-->
+                            <!--:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"-->
+                            <!--condition="f_meter_classify in {}"-->
+                            <!--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_meter_brand" multiple-->
+                            <!--v-model="model.f_meter_brand"-->
+                            <!--:options='$parent.$parent.meterbrands' placeholder='请选择'-->
+                            <!--condition="f_meter_brand in {}"-->
+                            <!--close-on-select></v-select>-->
+                <!--</div>-->
+                <div class="row">
+                  <div class="col-sm-2 form-group">
+                    <label for="startDate1" class="font_normal_body">收费日期</label>
+                    <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
+                                v-model="model.startDate1"
+                                :value.sync="model.startDate1"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_time_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endDate1" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                    <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
+                                v-model="model.endDate1"
+                                :value.sync="model.endDate1"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_time_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否缴费</label>
+                    <v-select :value.sync="model.f_is_pay" multiple
+                              v-model="model.f_is_pay"
+                              :options="$parent.$parent.ispays" placeholder='请选择'
+                              condition="f_is_pay in {}"
+                              close-on-select></v-select>
+                  </div>
                 </div>
               </div>
             </div>
@@ -212,11 +242,14 @@
                 <th>
                   <nobr>客户电话</nobr>
                 </th>
+                <!--<th>-->
+                  <!--<nobr>气表类型</nobr>-->
+                <!--</th>-->
+                <!--<th>-->
+                  <!--<nobr>气表品牌</nobr>-->
+                <!--</th>-->
                 <th>
-                  <nobr>气表类型</nobr>
-                </th>
-                <th>
-                  <nobr>气表品牌</nobr>
+                  <nobr>是否缴费</nobr>
                 </th>
                 <th>
                   <nobr>卡号</nobr>
@@ -249,10 +282,13 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-                  <data-order field="f_operate_date" name="收费日期"
+                  <data-order field="f_operate_date" name="欠费日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date">
                   </data-order>
                 </th>
+                <th>
+                  <nobr>收费日期</nobr>
+                </th>
                 <th>
                   <nobr>服务人员</nobr>
                 </th>
@@ -294,11 +330,14 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_meter_classify}}</nobr>-->
+              <!--</td>-->
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_meter_brand}}</nobr>-->
+              <!--</td>-->
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_classify}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_brand}}</nobr>
+                <nobr>{{row.f_is_pay}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
@@ -333,6 +372,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_time_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_service_person}}</nobr>
               </td>
@@ -635,6 +677,10 @@
       metertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
+      ispays() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('是否缴费')]
+      },
+
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       }

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

@@ -278,11 +278,10 @@ export default{
   },
 
   otherchargenopayConfig: {
-    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
-    'f_meter_brand': '气表品牌',
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话',
     'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
-    'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_operate_date': '收费日期',
+    'f_money': '收款', 'f_payment': '付款方式', 'f_state': '状态', 'f_time_date': '收费日期', 'f_operate_date': '欠费日期', 'f_is_pay': '是否缴费',
     'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
   },
@@ -680,7 +679,7 @@ export default{
     'f_money_pay': '现金', 'f_bank_pay': '银行转账', 'f_pre_pay': '预付账款抵减', 'f_sum_pay': '收款金额合计',
     'f_balance': '期末余额'
   },
-  gasInspectionConfig: {'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_meternumber': '表号', 'f_user_name': '客户名称',
+  gasInspectionConfig: {'f_userinfo_code': '客户编号','f_user_phone': '客户电话', 'f_olduserinfo_code': '档案编号', 'f_meternumber': '表号', 'f_user_name': '客户名称',
     'f_address': '地址', 'f_metertitles': '表箱号', 'f_user_type': '用户类型', 'f_gasproperties': '用气性质', 'f_table_state': '表具状态',
     'f_meter_brand': '气表品牌', 'f_book_slice_area': '表册片区', 'end_time': '最后抄表日期', 'f_meter_base': '表底数',
     'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'qianfei_month_num': '欠费月数', 'qianfei_num': '欠费条数',

package/src/components/sale/filesquery/MeterQuery.vue

@@ -544,7 +544,6 @@
         gasproperties:[],
         inputtouPerson: [],
         meterbooks:[{label: '全部',value: ''}],  //抄表册
-        inputtores:[{label: '全部',value: ''}],
         prices: [],
         //合计数据
         sumsmodel: {},

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -44,7 +44,11 @@
                 <button @click="$parent.$parent.clearmsg" class="button_clear">清空</button>
                 <export-excel
                   :choose-col="true"
-                  :data="{condition: $parent.$parent.condition}"
+                  :data="{condition: $parent.$parent.condition,
+                          f_orgid: $parent.$parent.f_orgid,
+                          f_start_date: $parent.$parent.f_start_date,
+                          f_end_date: $parent.$parent.f_end_date
+                          }"
                   :field="$parent.$parent.getfield" sql-name="manage_getNewQueryInstruct" sqlurl="rs/logic/exportfile"
                   template-name='指令查看'></export-excel>
                 <div
@@ -310,6 +314,9 @@
         orgcondition:'',
         show: false,
         condition:'',
+        f_orgid:'',
+        f_start_date:'',
+        f_end_date:'',
         getfield: {},
         config: {
           excelHeaders: {
@@ -400,19 +407,25 @@
         this.condition = args.condition
         if( this.$refs.paged.$refs.criteria.model.f_start_date!=null &&  this.$refs.paged.$refs.criteria.model.f_start_date!=''){
           this.model.params.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
+          this.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
         }else{
           this.model.params.f_start_date = '';
+          this.f_start_date = '';
         }
         if( this.$refs.paged.$refs.criteria.model.f_end_date!=null &&  this.$refs.paged.$refs.criteria.model.f_end_date!=''){
           this.model.params.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
+          this.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
         }else{
           this.model.params.f_end_date  = "";
+          this.f_end_date  = "";
         }
         if(this.f_orgid_new == '' || this.f_orgid_new == null){
           this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
+          this.f_orgid = `${this.$login.f.orgid}`;
           //await this.$LoadParams.loadParam(this.$login.f.orgid)
         }else{
           this.model.params.f_orgid = `'${this.f_orgid_new}'`;
+          this.f_orgid = `${this.f_orgid_new}`;
           //await this.$LoadParams.loadParam(this.f_orgid_new)
         }
         this.model.search(args.condition, args.model)

package/src/filiale/meihekou/UserQuery.vue

@@ -144,22 +144,22 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
-                           condition="f_building = '{}'" placeholder="楼栋"/>
+                           condition="f_building_num = '{}'" placeholder="楼栋"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
-                           condition="f_unit = '{}'" placeholder="单元"/>
+                           condition="f_unit_num = '{}'" placeholder="单元"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
-                           condition="f_floor = '{}'" placeholder="楼层"/>
+                           condition="f_floor_num = '{}'" placeholder="楼层"/>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;门牌号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_room"
-                           condition="f_room = '{}'" placeholder="门牌号">
+                           condition="f_room_num = '{}'" placeholder="门牌号">
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">余额区间</label>

package/src/filiale/qianneng/HandplanQuery.vue

@@ -285,6 +285,26 @@
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
 
+                <div class="col-sm-2 form-group">
+                  <label for="f_end_date" class="font_normal_body">违约金起始时间</label>
+                  <datepicker id="f_end_date" placeholder="开始日期" style="width:60%"
+                              v-model="model.endStartDate"
+                              :value.sync="model.endStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_end_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endEndDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endEndDate"
+                              :value.sync="model.endEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_end_date <= '{}'">
+                  </datepicker>
+                </div>
 
 <!--                <div class="col-sm-2 form-group" >-->
 <!--                  <label for="belongmonth" class="font_normal_body" >所属年月</label>-->
@@ -364,6 +384,9 @@
                 <th>
                   <nobr>滞纳金</nobr>
                 </th>
+                <th>
+                  <nobr>违约金起始时间</nobr>
+                </th>
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
@@ -412,6 +435,12 @@
                 <th>
                   <nobr>录入日期</nobr>
                 </th>
+                <th>
+                  <nobr>客户类型</nobr>
+                </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
                 <th>
                   <nobr>气价名称</nobr>
                 </th>
@@ -518,6 +547,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.overdue}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_end_date}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
@@ -566,6 +598,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_input_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_name}}</nobr>
               </td>

package/src/filiale/qianneng/exportConfig.js

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