manage-client 3.2.123 → 3.2.126

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/HandplanQuery.vue

@@ -106,9 +106,10 @@
                   <label class="font_normal_body">表单状态</label>
                   <v-select :value.sync="model.f_hand_state"
                             v-model="model.f_hand_state"
+                            multiple="true"
                             :options='$parent.$parent.handstate' placeholder='请选择'
-                            condition="f_hand_state = '{}'"
-                            close-on-select></v-select>
+                            condition="f_hand_state in {}"
+                            ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">录入人员</label>
@@ -286,6 +287,11 @@
                               condition="f_sellinggas_operate_date <= '{}'">
                   </datepicker>
                 </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_operator"
+                         condition="f_operator like '%{}%'" placeholder="下发人员">
+                </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">本次抄表表状态</label>
                   <v-select :value.sync="model.f_result_state"

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/GasLossQuery.vue

@@ -267,7 +267,7 @@
 <script>
   import {PagedList, HttpResetClass} from 'vue-client'
   import defaultPrint from '../../components/sale/config/DefaultPrint'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   import axios from 'axios'
 
   let readySomething = async function (self) {

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>
@@ -524,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>

package/src/filiale/qianneng/exportConfig.js

@@ -24,13 +24,19 @@ 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': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月'
   },
+  gaslossConfig: {
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_charge_person': '缴费人', 'f_charge_phone': '缴费人电话',
+    'f_charge_address': '缴费人地址', 'f_collection': '缴费金额', 'f_payment': '付款方式', 'f_bill_style': '打印格式',
+    'f_serial_id': '流水号', 'f_pay_id': '支付单号', 'detail': '详细信息', 'f_charge_date': '缴费日期',
+    'f_depname': '部门', 'f_operator': '操作员'
+  },
   batchBankConfig2: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',
     'f_bank_accopen': '银行户名', 'f_bank_pay_number': '缴费编号', 'f_bank_account': '银行开户账号', 'f_paper_account': '开户行及账号',