manage-client 3.2.140 → 3.2.142

package/src/filiale/qianneng/MeterQuery.vue

@@ -198,6 +198,19 @@
                               condition="isbgl = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">自动阀控</label>
+                    <v-select
+                      placeholder='自动阀控'
+
+                      :value.sync="model.f_network_valve"
+                      style="width:60%"
+                      v-model="model.f_network_valve"
+                      :options='$parent.$parent.networkvalves'
+                      close-on-select
+                      condition="f_networkvalve='{}'">
+                    </v-select>
+                  </div>
                   <!--<div class="col-sm-2 form-group">-->
                     <!--<label class="font_normal_body" title="旧客户编号">档案编号</label>-->
                     <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
@@ -379,6 +392,9 @@
                   <th>
                     <nobr>防盗卡号2</nobr>
                   </th>
+                  <th>
+                    <nobr>自动阀控</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -475,6 +491,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_defendcard_two}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_networkvalve}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -624,7 +643,8 @@
         tempfalg :false,
         lastorgstr:'',
         issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
-        usetype:this.$appdata.getParam('使用类型')
+        usetype:this.$appdata.getParam('使用类型'),
+        networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : []
       }
     },
     ready() {

package/src/filiale/rongcheng/RecordInfoQuery.vue

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

package/src/reportManage.js

@@ -599,6 +599,16 @@ export default function (filiale) {
   Vue.component('market-month-gas', (resolve) => {
     require(['./components/SellReport/MarketMonthgas'], resolve)
   })
+  Vue.component('left-chart', (resolve) => {
+    require(['./components/SellReport/LeftChart'], resolve)
+  })
+  Vue.component('market-month-chart', (resolve) => {
+    require(['./components/SellReport/MarketMonthChart'], resolve)
+  })
+  // 卡表抄表气价报表
+  Vue.component('card-applys-gas', (resolve) => {
+    require(['./components/SellReport/Cardapplysgas'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/saleManage.js

@@ -174,6 +174,10 @@ export default function (filiale) {
   Vue.component('residential-query', (resolve) => {
     require(['./components/sale/businessquery/ResidentialQuery'], resolve)
   })
+  // 小区汇总（卡表）
+  Vue.component('residential-card-query', (resolve) => {
+    require(['./components/sale/businessquery/ResidentialCardQuery'], resolve)
+  })
   // 小区欠费汇总（机表）
   Vue.component('residential-arrears-query', (resolve) => {
     require(['./components/sale/businessquery/ResidentialArrearsQuery'], resolve)
@@ -582,6 +586,8 @@ export default function (filiale) {
   Vue.component('report-detail', (resolve) => { require(['./components/sale/businessquery/reportDetail'], resolve) })
   // 分公司选择新组件,默认全选
   Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve) })
+  // 重点用户用气排行查询
+  Vue.component('key-user-gas-ranking', (resolve) => { require(['./components/sale/businessquery/AccountQuery/keyUserGasRanking'], resolve) })
   // 分公司特殊页面注册替换
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/sale`).specialComp