manage-client 4.0.42 → 4.0.44

package/src/filiale/bayan/config/exportConfig.js

@@ -632,7 +632,14 @@ export default {
     'f_devices_type': '灶具信息',
     'f_network_valve': '自动阀控',
     'f_defendcard': '防盗卡号',
-    'f_factory_date': '生产年月'
+    'f_factory_date': '生产年月',
+    'f_isalarm': '有无报警器',
+    'f_alarm_manufacturers': '报警器厂家',
+    'f_alarms_number': '报警器个数',
+    'f_isfan': '有无风机',
+    'f_fan_model': '风机规格型号',
+    'f_is_control_cut_valve': '有无控制切断阀',
+    'f_control_cut_valve_model': '切断阀规格型号'
   },
 
   compreConfigGY: {
@@ -796,6 +803,18 @@ export default {
     'f_orgname': '公司',
     'f_meternumber': '表号'
   },
+  otherchargeExportConfig: {
+    'f_user_name': '客户名称',
+    'f_address': '客户地址',
+    'f_brand_spec': '收费类型',
+    'f_typename': '品名规格',
+    'f_typenumber': '型号',
+    'f_number': '数量',
+    'f_money': '收款',
+    'f_payment': '付款方式',
+    'f_operate_date': '收费日期',
+    'f_operator': '操作员'
+  },
 
   otherchargenopayConfig: {
     'f_userinfo_code': '客户编号',

package/src/filiale/bayan/sale.js

@@ -5,4 +5,12 @@ export default function () {
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
   // 打印
   Vue.component('print-table', (resolve) => { require(['./PrintTableManage'], resolve) })
+  // 其他收费查询
+  Vue.component('other-charge-query', (resolve) => {
+    require(['./OtherChargeQuery'], resolve)
+  })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => {
+    require(['./RecordInfoQuery'], resolve)
+  })
 }

package/src/filiale/meihekou/AreaGeneralQuery.vue

@@ -135,6 +135,7 @@
         show:false,
         other:[],
         footer:[],
+        condition: ' 1=1 ',
         model: new PagedList('api/af-revenue/sql/areaGeneralQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
         criteriaShow: false,
         //小区
@@ -185,6 +186,7 @@
             this.getorg([this.$login.f.orgid])
           }
           args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+          this.condition = args.condition
           this.model.search(args.condition, args.model)
         }
       },
@@ -216,7 +218,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          condition: this.condition,
           condValue: `${this.model.condValue}`
         }
       },

package/src/filiale/rongcheng/ChargeQuery.vue

@@ -268,7 +268,20 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_street"
                          condition="f_street like '%{}%'" placeholder='街道'>
                 </div>
-
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">充值金额</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_collection_small"
+                         condition="f_collection >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_collection_big"
+                         condition="f_collection <= '{}' " placeholder="小于等于">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">充值气量</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_pregas_small"
+                         condition="f_pregas >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_pregas_big"
+                         condition="f_pregas <= '{}' " placeholder="小于等于">
+                </div>
               </div>
             </div>
           </criteria>

package/src/filiale/xinkang/ManageBrandHouseCount.vue

@@ -6,24 +6,24 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <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>-->
-<!--                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"-->
-<!--                              v-model="model.startDate"-->
-<!--                              :value.sync="model.startDate"-->
-<!--                              :format="'yyyy-MM-dd 00:00:00'"-->
-<!--                              :show-reset-button="true">-->
-<!--                  </datepicker>-->
-<!--                </div>-->
-<!--                <div class="col-sm-2 form-group">-->
-<!--                  <label for="endDate" class="font_normal_body">结束日期</label>-->
-<!--                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"-->
-<!--                              v-model="model.endDate"-->
-<!--                              :value.sync="model.endDate"-->
-<!--                              :format="'yyyy-MM-dd 23:59:59'"-->
-<!--                              :show-reset-button="true">-->
-<!--                  </datepicker>-->
-<!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
                   <right-tree @re-res="$parent.$parent.getRes"></right-tree>
@@ -55,10 +55,10 @@
                                 :footer="$parent.$parent.footer"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile"
                                 sql-name="manageBrandHouseCount"
-                                template-name='用户查询报表'
+                                template-name='用户报表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                              titletable="用户查询" :starthead="$parent.$parent.startDate" :defaultfield="$parent.$parent.defaultfield"
+                              titletable="用户报表" :starthead="$parent.$parent.startDate" :defaultfield="$parent.$parent.defaultfield"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
                 </div>
               </div>
@@ -153,12 +153,8 @@ import defaultPrint from '../../components/sale/config/DefaultPrint'
 import exportConfig from './exportConfig'
 import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
 
-let readySomething = async function (self) {
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-}
 export default {
-  title: '用户查询',
+  title: '用户报表',
   data() {
     return {
       depresid: [],
@@ -166,6 +162,7 @@ export default {
       f_orgid: this.$login.f.orgid,
       f_depid: this.$login.f.depids,
       f_operatorid: this.$login.f.id,
+      userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
       operatorid: [],
       depid: [],
       orgname: '',
@@ -175,7 +172,7 @@ export default {
       data: {},
       other:[],
       footer:[],
-      model: new PagedList('api/af-revenue/sql/manageBrandHouseCount', 20, { f_orgid: 'this.model.f_orgid'},{
+      model: new PagedList('api/af-revenue/sql/manageBrandHouseCount', 20, { startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
         f_total_users: 0,
         f_civilian_users: 0,
         f_non_civilian_users: 0,
@@ -201,11 +198,6 @@ export default {
     }
   },
   ready() {
-    readySomething(this).then(() => {
-      this.$emit('ready')
-    }).catch((error) => {
-      this.$emit('error', error)
-    })
   },
   methods: {
     getotherfooter(){