manage-client 3.2.115 → 3.2.118

package/src/filiale/jingwei/RecordInfoQuery.vue

@@ -701,12 +701,7 @@
         tfoot: '',
         defaultfield: [],
         //排序
-        orderitem: 'f_residential_area',
-        orderitem1: 'f_unit',
-        orderitem2: 'f_building',
-        orderitem3: 'f_floor',
-        orderitem4: 'f_room',
-
+        orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
         orderFields: {
           f_operate_date: 'no'
         },
@@ -793,7 +788,6 @@
         // this.footer.push(footerData);
         this.other.push(otherInData);
       },
-
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -1018,35 +1012,24 @@
           this.meterbooks = [{label: '全部',value: ''}]
         }
       },
-        sort (field, rule) {
-        console.log('sort',this.orderFields)
-          let sortStr = ''
+      sort (field, rule) {
         // 将所有排序方式设为不排序，实现相互排斥
         for (let key in this.orderFields) {
-          if (this.orderFields[key] != 'no') {
-            if (key == 'f_address') {
-              sortStr += `,${this.orderitem} ${this.orderFields[key]}, ${this.orderitem2} ${this.orderFields[key]}, ${this.orderitem1} ${this.orderFields[key]},${this.orderitem3} ${this.orderFields[key]},${this.orderitem4} ${this.orderFields[key]}`
-            } else {
-              sortStr += `,${key} ${this.orderFields[key]}`
-            }
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
           }
         }
-          if (sortStr == '') {
-            sortStr += `,f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc`
-          }
-          this.model.model.items = sortStr.replace(',','').toString()
-          this.model.paramSource.items = 'this.model.items'
-
-          // 如果新规则不排序，还原为默认排序
-          // if (rule === 'no'|| rule === 'desc') {
-          //   this.model.paramSource.items= `'${this.orderitem} desc,${this.orderitem2} desc,${this.orderitem1} desc,${this.orderitem3} desc,${this.orderitem4} desc'`
-          // } else {
-          //   this.model.paramSource.items= `'${this.orderitem},${this.orderitem2},${this.orderitem1},${this.orderitem3},${this.orderitem4} ${rule}'`
-          // }
-          //
-          console.log('sortstr',sortStr.replace(',',''))
-          this.search()
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
         }
+
+        this.search()
+      }
     },
     watch:{
       'model.rows.length' () {

package/src/filiale/qianneng/BusinessManage.vue

@@ -7,6 +7,9 @@
     <tabs header="其他收费查询" v-if="permission('其他收费查询')">
       <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
     </tabs>
+    <tabs header="其他收费欠费查询" v-if="permission('其他收费欠费查询')">
+      <other-charge-nopay-query v-if="show.includes('其他收费欠费查询')" @deal-msg="dealMsg" :data="data"></other-charge-nopay-query>
+    </tabs>
     <tabs header="机表抄表查询" v-if="permission('机表抄表查询')">
       <handplan-query v-if="show.includes('机表抄表查询')" @deal-msg="dealMsg" :data="data"></handplan-query>
     </tabs>

package/src/filiale/qianneng/MeterQuery.vue

@@ -304,6 +304,9 @@
                     <!--<nobr>客户地址</nobr>-->
                     <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                   </th>
+                  <th>
+                    <nobr>客户状态</nobr>
+                  </th>
                   <th>
                     <nobr>表册片区</nobr>
                   </th>
@@ -330,6 +333,9 @@
                   <th>
                     <nobr>气价名称</nobr>
                   </th>
+                  <th>
+                    <nobr>气价编码</nobr>
+                  </th>
                   <th>
                     <nobr>气价详情</nobr>
                   </th>
@@ -356,12 +362,23 @@
                   <th>
                     <nobr>气表状态</nobr>
                   </th>
+                  <th>
+                    <nobr>气表分类</nobr>
+                  </th>
                   <th>
                     <nobr>是否壁挂炉</nobr>
                   </th>
                   <th>
                     <nobr>入户证号</nobr>
                   </th>
+
+
+                  <th>
+                    <nobr>防盗卡号1</nobr>
+                  </th>
+                  <th>
+                    <nobr>防盗卡号2</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -386,6 +403,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_state}}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_book_slice_area}}</nobr>
                 </td>
@@ -412,6 +432,9 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_price_name}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_price_id}}</nobr>
+                </td>
                 <th :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.value}}</nobr>
                 </th>
@@ -436,12 +459,22 @@
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_table_state}}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meter_classify}}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.isbgl}}</nobr>
                 </td>
                 <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_enter_number}}</nobr>
                 </td>
+
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_defendcard}}</nobr>
+                </td>
+                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_defendcard_two}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>

package/src/filiale/wuhai/ChargeQuery.vue

@@ -302,6 +302,15 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_stair3price"
                          condition="f_stair3price = {} " placeholder='三阶单价'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" >气量阶级</label>
+                  <v-select :value.sync="model.f_stair_types"
+                            v-model="model.f_stair_types"
+                            :options='$parent.$parent.stairtypes' placeholder='请选择'
+                            condition="f_stair_types = '{}'"
+                            close-on-select :search="false">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -864,6 +873,14 @@
         inputtores:[{label: '全部',value: ''}],
         writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'}],
         bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
+        stairtypes:[
+          {label: '一阶',value: '一阶'},
+          {label: '二阶',value: '二阶'},
+          {label: '三阶',value: '三阶'},
+          {label: '二阶三阶',value: '二阶三阶'},
+          {label: '一阶二阶',value: '一阶二阶'},
+          {label: '一阶二阶三阶',value: '一阶二阶三阶'}
+        ],
         allorgid:[],
         tempfalg :false,
         lastorgstr:'',

package/src/reportManage.js

@@ -545,7 +545,14 @@ export default function (filiale) {
   // 报表展示组件(日结账报表)
   Vue.component('bus-summaryes', (resolve) => {
     require(['./components/SellReport/BusSummaryes'], resolve)
-
+  })
+  // 乌海公服报表
+  Vue.component('gf-report-wh', (resolve) => {
+    require(['./components/SellReport/GFReportWH'], resolve)
+  })
+  // 乌海居民用气物联网气价报表
+  Vue.component('price-report-whwu', (resolve) => {
+    require(['./components/SellReport/PriceReportWHwu'], resolve)
   })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp

package/src/saleManage.js

@@ -156,6 +156,10 @@ export default function (filiale) {
   Vue.component('other-charge-query', (resolve) => {
     require(['./components/sale/businessquery/OtherChargeQuery'], resolve)
   })
+  // 其他收费欠费查询
+  Vue.component('other-charge-nopay-query', (resolve) => {
+    require(['./components/sale/businessquery/OtherChargeNopayQuery'], resolve)
+  })
   // 冲正查询
   Vue.component('reverse-query', (resolve) => {
     require(['./components/sale/businessquery/ReverseQuery'], resolve)