manage-client 3.2.215 → 3.2.217

package/src/filiale/WEINAN/sale.js

@@ -1,52 +1,54 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用户稽查查询
-  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
-  //换表查询
-  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
-  //补气查询
-  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
-  //表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
-  //表具档案综合查询
-  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
-  // 业务查询
-  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
-  // 换表查询
-  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-  // 上报数据查询
-  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
-  // 上报统计分析--抄表分析
-  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
-  // 用气分析明细查询
-  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
-  // 用气分析图表分析
-  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
-  // 启用查询
-  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
-  // 停用查询
-  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
-  // 销户查询
-  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
-  // 汇总查询
-  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
-  // 开户查询
-  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
-  // 购气稽查
-  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
-  // 档案合并查询
-  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
-  //地址管理
-  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
-  //地址变更记录
-  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 其他收费查询
+  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
+  // 用户稽查查询
+  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
+  //换表查询
+  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
+  //补气查询
+  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
+  //表具查询
+  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
+  //表具档案综合查询
+  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
+  // 业务查询
+  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
+  // 换表查询
+  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
+  // 上报数据查询
+  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
+  // 上报统计分析--抄表分析
+  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
+  // 用气分析明细查询
+  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
+  // 用气分析图表分析
+  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
+  // 启用查询
+  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
+  // 停用查询
+  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 销户查询
+  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
+  // 汇总查询
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
+  // 购气稽查
+  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
+  // 档案合并查询
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
+  //地址管理
+  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
+  //地址变更记录
+  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
+  // 统计分析
+  'statistical-analysis': (resolve) => { require(['./StatisticalAnalysis.vue'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/jingwei/ChargeQuery.vue

@@ -294,6 +294,16 @@
                             condition="f_operator in {}"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">金额</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_small"
+                           condition="f_collection >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_big"
+                           condition="f_collection <= {} " placeholder="">
+                  </div>
+                </div>
               </div>
             </div>
           </criteria>

package/src/filiale/wuhai/ChargeQuery.vue

@@ -758,7 +758,7 @@
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './config/exportConfig'
   let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
 
@@ -811,7 +811,7 @@
 
         footer:[],
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date','f_address','f_pregas','fee','f_payment','f_depname']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date','f_address','fee','f_payment','f_depname']
         },
         //排序
         orderitem:'f_operate_date desc',

package/src/filiale/wuhai/OtherChargeQuery.vue

@@ -46,7 +46,7 @@
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile" sql-name="otherChargeQuery" template-name='其他收费查询导出'
-                                :choose-col="true"></export-excel>
+                                :choose-col="true" :defaultselect="$parent.$parent.defaultexport"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                :defaultfield="$parent.$parent.defaultfield"
                               titletable="其他收费记录"
@@ -405,7 +405,7 @@
 <script>
   import {PagedList} from 'vue-client'
   import defaultPrint from '../../components/sale/config/DefaultPrint'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './config/exportConfig'
   import OtherChargeDetailQuery from "../../components/sale/businessquery/OtherChargeDetailQuery";
 
   let readySomething = async function (self) {
@@ -659,6 +659,9 @@
       service_person() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
       },
+      defaultexport(){
+        return exportConfig.otherchargeexportConfig
+      },
       getfield() {
         return exportConfig.otherchargeConfig
       },

package/src/filiale/wuhai/ReportList.vue

@@ -92,6 +92,7 @@
                   <v-select :value.sync="model.f_meter_brand"
                             v-model="model.f_meter_brand"
                             :options="$parent.$parent.meterbrands"
+                            @change="$parent.$parent.meterBrandChange"
                             condition="br.f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
@@ -143,6 +144,12 @@
                 <th><nobr>表内剩余金额</nobr></th>
                 <th><nobr>表内单价</nobr></th>
                 <th><nobr>本次抄表底数</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计标况累计量</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计工况累计量</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(标况)</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(工况)</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计温度</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计压力</nobr></th>
                 <th><nobr>阀门状态</nobr></th>
 
                 <th><nobr>上报类型</nobr></th>
@@ -169,6 +176,12 @@
                 <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionTotal}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeTotalForDay}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionFlow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeFlow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterTemperatureState}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterPressureState}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
 
 
@@ -272,8 +285,9 @@
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
         orgCondtionStr: '',
-        model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0,f_total_fee}),
-        areaList:[]
+        model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0,f_total_fee: 0}),
+        areaList:[],
+        isShow:false,
       }
     },
     ready () {
@@ -289,6 +303,16 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      meterBrandChange(val){
+        console.log("气表品牌改变。。。。。" + val)
+        if(val !== undefined){
+          if(val == '真兰表端物联网表' || val == '真兰系统物联网表'){
+            this.isShow = true
+          } else {
+            this.isShow = false
+          }
+        }
+      },
       async initQueryParam () {
         let brr = []
         let http = new HttpResetClass()

package/src/filiale/wuhai/config/DefaultPrint.js

@@ -0,0 +1,6 @@
+export default{
+  //把打印需要默认选中的字段名放在config数组中
+  config: [
+    "f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_idnumber"
+  ]
+}