sale-client 4.0.8-preview → 4.0.10-preview

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Sep 09 09:42:20 CST 2024
+#Thu Aug 22 10:59:01 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -19,11 +19,26 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      '/api/af-revenue': {
-        pathRewrite:{
-          '/api/af-revenue':'/rs'
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
         },
-        target: 'http://localhost:8080/'
+        target: 'http://localhost:9026/'
+      },
+      '/api/af-revenue/file': {
+        pathRewrite: {
+          '/api/af-revenue/file': '/file'
+        },
+        target: 'http://localhost:9026/'
+      },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: 'http://localhost:9026/'
+      },
+      '/api': {
+        target: 'http://192.168.50.67:31567'
       },
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
@@ -37,9 +52,6 @@ var devConfig = {
       '/rs/file': {
         target: localUrl
       },
-      '/api': {
-        target: 'http://192.168.50.67:31567'
-      },
       '/webapps': {
         target: serverRul
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.8-preview",
+  "version": "4.0.10-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/base/rightview/CardList.vue

@@ -492,6 +492,14 @@
           }
         } else if (type === '垃圾费收费') {
           name = 'api/af-revenue/report/garbageChargeReport'
+        } else if (type === '物联网赠费') {
+          name = 'api/af-revenue/report/iotGiftFee'
+        }else if (type === '物联网赠气') {
+          name = 'api/af-revenue/report/iotGiftGas'
+        }else if (type === '卡表赠费') {
+          name = 'api/af-revenue/report/icGiftFee'
+        }else if (type === '卡表赠费') {
+          name = 'api/af-revenue/report/icGiftGas'
         }
         return name
       },

package/src/components/revenue/cardHandManage/cardHandManager.vue

@@ -16,7 +16,6 @@
 <script>
   import TabButton from './../comprehen/common/TabButton'
   import Tabs from './../comprehen/common/Tabs'
-
 export default {
     name: 'cardHandManager',
     title: '卡表抄表管理',

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeMachine.vue

@@ -52,6 +52,7 @@
     <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
     <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
     <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='data' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
   </div>
   <upload :blodid="data.f_userinfo_id" v-if="true" :businessid="randomBusinessId" isremark="true" fusetype="补气"></upload>
 </template>
@@ -59,7 +60,10 @@
 
 <script>
 import Vue from 'vue'
-
+let asyncFeeMachine = async function (self) {
+  await self.$getConfig(self, 'feeMachine')
+  console.log('机表补费扣费config', self.config)
+}
 export default {
   title: '机表补费扣费',
   data () {
@@ -76,8 +80,16 @@ export default {
         f_preamount: 0,
 
         f_comments: ''
-      }
-
+      },
+      config: {
+        hasPrint: true
+      },
+      billData: {
+        url: 'api/af-revenue/report/MakeUp',
+        operator: this.$login.f.name,
+        billnumber: ''
+      },
+      print: false
     }
   },
   props: ['data'],
@@ -86,6 +98,7 @@ export default {
     // if(this.data.f_collection_type==='按气量'){
     this.model.f_operat_type = ['机表补费']
     this.getRandomId()
+    asyncFeeMachine(this)
     // }else{
     // this.model.f_operat_type=['物联网补费']
     // }
@@ -153,9 +166,19 @@ export default {
         }
         console.log('-------------------------->', data1)
         this.$resetpost('api/af-revenue/logic/updatefiles', data1)
-        this.clean()
+        if (this.config.hasPrint) {
+          this.data.id = res.data.id
+          this.data.f_bill_type = '机表补费扣费'
+          this.data.f_bill_style = '普通收据'
+          this.print = true
+        } else {
+          this.clean()
+        }
       })
     },
+    printok () {
+      this.$dispatch('success')
+    },
     clean () {
       this.$dispatch('refresh')
     }

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -47,6 +47,7 @@
           <button class="button_clear" @click="clean()" >取消</button>
         </div>
       </validator>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
     </div>
   </div>
   <upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="赠气"></upload>
@@ -99,6 +100,12 @@ let otherGasGen = async function (self) {
       throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
     } else {
       await self.$CommonService.updatePassword(self.row, cardRes)
+      if (self.config.hasPrint) {
+        self.row.id = result.data.id
+        self.row.f_bill_type = self.isGas ? '卡表赠气' : '卡表赠费'
+        self.row.f_bill_style = '普通收据'
+        self.print = true
+      }
       self.$showAlert('赠气成功', 'success', 2000)
       return result.data.id
     }
@@ -114,6 +121,10 @@ let otherGasGen = async function (self) {
     await self.$resetpost('api/af-revenue/logic/otherGasRollback', {data: rollback}, {rejectMsg: '赠气回滚出错', resolveMsg: null})
   }
 }
+let asyncIcTable = async function (self) {
+  await self.$getConfig(self, 'iotTable')
+  console.log('机表补费扣费config', self.config)
+}
 
 export default {
   title: '卡表赠气赠费',
@@ -135,6 +146,14 @@ export default {
         f_reason: ''
         // f_add_gas: '不计入'
       },
+      config: {
+        hasPrint: true
+      },
+      billData: {
+        url: 'api/af-revenue/report/icGiftGas',
+        operator: this.$login.f.name,
+        billnumber: ''
+      },
       print: false
     }
   },
@@ -144,6 +163,12 @@ export default {
     this.row.cardInfo = this.cardData
     console.log('卡信息', this.row.cardInfo)
     this.getRandomId()
+    asyncIcTable(this)
+    if (this.isGas) {
+      this.billData.url = 'api/af-revenue/report/icGiftGas'
+    } else {
+      this.billData.url = 'api/af-revenue/report/icGiftFee'
+    }
   },
   events: {
     // 删除Resid数组元素

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -51,6 +51,7 @@
     <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
     <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
     <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
   </div>
   <upload :blodid="row.f_userinfo_id"  v-ref:upload  :businessid="randomBusinessId"  :isremark="true" fusetype="赠气"></upload>
 
@@ -59,7 +60,10 @@
 
 <script>
 import Vue from 'vue'
-
+let asyncIotTable = async function (self) {
+  await self.$getConfig(self, 'iotTable')
+  console.log('机表补费扣费config', self.config)
+}
 export default {
   title: '赠气赠费',
   data () {
@@ -76,19 +80,33 @@ export default {
         f_preamount: 0,
 
         f_comments: ''
-      }
-
+      },
+      config: {
+        hasPrint: true
+      },
+      billData: {
+        url: 'api/af-revenue/report/iotGiftGas',
+        operator: this.$login.f.name,
+        billnumber: ''
+      },
+      print: false
     }
   },
   props: ['row'],
   ready () {
     // this.blodid = this.row.f_userinfo_id
     this.getRandomId()
+    asyncIotTable(this)
     if (this.row.f_collection_type === '按气量') {
       this.model.f_operat_type = ['物联网赠气']
     } else {
       this.model.f_operat_type = ['物联网赠费']
     }
+    if (this.row.f_collection_type === '按气量') {
+      this.billData.url = 'api/af-revenue/report/iotGiftGas'
+    } else {
+      this.billData.url = 'api/af-revenue/report/iotGiftFee'
+    }
   },
   events: {
     // 删除Resid数组元素
@@ -135,7 +153,7 @@ export default {
           f_card_id: this.row.f_card_id,
           f_balance: this.row.f_balance_amount,
           f_operat_type: this.model.f_operat_type[0],
-          f_describe: `${this.$login.f.name}对用户${this.row.f_user_name}进行${this.model.f_operat_type}操作`,
+          f_describe: `${this.$login.f.name}对用户${this.row.f_user_name}进行${this.model.f_operat_type[0]}操作`,
           f_state: '有效'
           // f_table_state:'有效'
         }
@@ -152,9 +170,19 @@ export default {
           f_blobid: res.data.id
         }
         this.$resetpost('api/af-revenue/logic/updatefiles', data)
-        this.clean()
+        if (this.config.hasPrint) {
+          this.row.id = res.data.id
+          this.row.f_bill_type = this.row.f_collection_type === '按气量' ? '物联网赠气' : '物联网赠费'
+          this.row.f_bill_style = '普通收据'
+          this.print = true
+        } else {
+          this.clean()
+        }
       })
     },
+    printok () {
+      this.$dispatch('success')
+    },
     clean () {
       this.$dispatch('refresh')
     }

package/src/filiale/meihekou/MeterBookAdd.vue

@@ -86,9 +86,9 @@
                         style="width: 60%" v-model="model.f_hand_end_date">
             </datepicker>
           </div>
-          <div :class="[$v.f_period.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_period" v-show="false"
-                   v-validate:f_period='{required: true }'>
+          <div :class="[$v.f_book_state.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_book_state" v-show="false"
+                   v-validate:f_book_state='{required: true }'>
             <label class="font_normal_body">表&emsp;册&emsp;状&emsp;态&emsp;</label>
             <v-select :value.sync="model.f_book_state" v-model='model.f_book_state'
                       style="width:55%"

package/src/filiale/meihekou/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -76,24 +76,24 @@
           </template>
           <template partial='body' partial='list' v-ref:grid>
             <tr >
-              <td style="text-align:center">{{row.f_userinfo_code}}</td>
-              <td style="text-align:center">{{row.f_user_name}}</td>
-              <td style="text-align:center">{{row.f_address}}</td>
-              <td style="text-align:center">{{row.f_last_tablebase}}</td>
-              <td style="text-align:center">{{row.f_tablebase}}</td>
-              <td style="text-align:center">{{row.f_type== '机表收费'? '' : row.gas}}</td>
-              <td style="text-align:center;white-space:nowrap;">{{row.f_type == '机表收费'? '' : row.fee}}</td>
-              <td style="text-align:center;white-space:nowrap;">{{row.f_type == '余额抵扣'? '' : row.f_collection}}</td>
-              <td style="text-align:center;white-space:nowrap;">{{row.f_overdue}}</td>
-              <td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
-              <td style="text-align:center;white-space:nowrap;">
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_userinfo_code}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_user_name}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_address}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_tablebase}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type== '机表收费'? '' : row.gas}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '机表收费'? '' : row.fee}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '余额抵扣'? '' : row.f_collection}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_overdue}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">
                 {{ row.f_type == '余额抵扣'? (row.f_balance - row.fee).toFixed(1) : row.f_curbalance }}
               </td>
-              <td style="text-align:center">{{row.f_type}}</td>
-              <td style="text-align:center">{{row.f_operator}}</td>
-              <td style="text-align:center">{{row.f_operate_date}}</td>
-              <td style="text-align:center">{{row.f_state}}</td>
-              <td style="text-align:center">{{row.f_comments}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operator}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operate_date}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_state}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_comments}}</td>
             </tr>
           </template>
           <template partial='foot'></template>
@@ -112,6 +112,9 @@
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           金额合计:&emsp;{{model.sums.fee.toFixed(2)}}
         </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          缴费合计:&emsp;{{model.sums.collection.toFixed(2)}}
+        </td>
       </tr>
     </table>
   </div>
@@ -173,11 +176,16 @@
         let feeTotal = res.data.reduce((sum, row) => {
           return row.f_type === '机表收费' ? sum : sum + (row.fee || 0);
         }, 0);
+        // 计算缴费总和
+        let collectionTotal = res.data.reduce((sum, row) => {
+          return sum + (row.f_collection || 0)
+        }, 0)
 
         this.printModel.rows = res.data
         this.model.sums = {
           gas: gasTotal,
-          fee: feeTotal
+          fee: feeTotal,
+          collection: collectionTotal
         }
       },
       // 多选框初始化

package/src/filiale/rongchuang/LimitGas.vue

@@ -147,7 +147,7 @@ export default {
     return {
       disabled: true,
       model: {
-        f_third_pay: '0',
+        f_third_pay: '1',
         f_time_type: '按月',
         f_limit_times: '',
         f_time_value: '',
@@ -192,7 +192,7 @@ export default {
     confirm () {
       this.$dispatch('limit', this.model)
       this.model = {
-        f_third_pay: '0',
+        f_third_pay: '1',
         f_time_type: '按月',
         f_limit_times: '',
         f_time_value: '',
@@ -211,7 +211,7 @@ export default {
       }
       await this.$resetpost('api/af-revenue/logic/runSQL', data)
       this.model = {
-        f_third_pay: '0',
+        f_third_pay: '1',
         f_time_type: '按月',
         f_limit_times: '',
         f_time_value: '',

package/src/filiale/yuncheng/ChangeMeter.vue

@@ -844,6 +844,15 @@ export default {
           return
         }
       }
+      if (this.row.f_meter_brand.includes('膜表')) {
+        console.log('判断一下', this.row)
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a < b) {
+          this.$showMessage(`膜表旧表底数不能小于系统表当前表底数！！！`, ['cancel'], 3000)
+          this.model.f_using_base_old = ''
+        }
+      }
       if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {

package/src/filiale/yuncheng/HandplanQuery.vue

@@ -327,6 +327,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
+                <th>
+                  <nobr>防盗卡号</nobr>
+                </th>
                 <th>
                   <nobr>表前阀状态</nobr>
                 </th>
@@ -497,6 +500,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_defendcard}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_bqf_state}}</nobr>
               </td>
@@ -866,7 +872,8 @@
             'f_stair3amount': '三阶气量',
             'f_stair3price': '三阶单价',
             'f_stair3fee': '三阶气费',
-            'f_rest_date': '所属年月'}
+            'f_rest_date': '所属年月',
+            'f_defendcard': '防盗卡号'}
         },
         batchBankConfig2: {'f_userinfo_code': '客户编号',
           'f_userinfo_id': '用户编号',

package/src/filiale/yuncheng/changemeterListMaintain.vue

@@ -0,0 +1,504 @@
+<template>
+  <div>
+    <div style="flex: 1.5" class="flex">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
+                    v-show="$parent.searchshow">
+            <div novalidate class="form-inline auto" partial>
+              <!--              <div class="col-sm-2 form-group">-->
+              <!--                <label class="font_normal_body">组织机构</label>-->
+              <!--                <res-select :initresid='$parent.$parent.curorgid'-->
+              <!--                            @res-select="$parent.$parent.getorg"-->
+              <!--                            class="select select_list"-->
+              <!--                            restype='organization'-->
+              <!--                            style="width: 60%">-->
+              <!--                </res-select>-->
+              <!--              </div>-->
+              <div class="row">
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search" @click="search()">查 询</button>
+                  <export-excel v-if="$parent.$parent.excelTable"
+                                class="auto"
+                                :data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/saleExport" progress="saleGetExportProgress"  sql-name="changemeterFiles"
+                                template-name='换表记录'
+                                :choose-col="true"></export-excel>
+                  <div
+                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                    @click="$parent.$parent.hidden()"
+                    class="button_spacing"
+                    style="float: right"></div>
+                </div>
+              </div>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户姓名</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder='客户姓名'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">有无附件</label>
+                  <v-select :disabled=false
+                            :options='$parent.$parent.pj'
+                            :value-single="true"
+                            :value.sync="model.is_has_file"
+                            close-on-select
+                            placeholder='请选择'
+                            v-model="model.is_has_file"
+                            condition="is_has_file = '{}'"
+                            search=fasle
+                  >
+                  </v-select>
+                </div>
+                <!--                <div-->
+                <!--                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"-->
+                <!--                  class="form-group">-->
+                <!--                  <label class="font_normal_body">换表编号</label>-->
+                <!--                  <input type="text" class="input_search"  style="width: 60%" v-model="model.id"-->
+                <!--                         condition="id = '{}'" placeholder='用户编号'>-->
+                <!--                </div>-->
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select id="f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            placeholder='气表品牌'
+                            :value.sync="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrand'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
+                              :format="'yyyy-MM-dd 00:00:00'" condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                              :format="'yyyy-MM-dd 23:59:59'" condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+            </div>
+
+          </criteria>
+          <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>序号</nobr>
+                </th>
+                <th>
+                  <nobr>客户编号</nobr>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>客户地址</nobr>
+                </th>
+                <th>
+                  <nobr>换表类型</nobr>
+                </th>
+                <th>
+                  <nobr>换表费</nobr>
+                </th>
+                <th>
+                  <nobr>换表单号</nobr>
+                </th>
+                <th>
+                  <nobr>旧表号</nobr>
+                </th>
+                <th>
+                  <nobr>新表号</nobr>
+                </th>
+                <th>
+                  <nobr>旧气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>新气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>旧表剩余补气量</nobr>
+                </th>
+                <th>
+                  <nobr>旧表具剩余金额</nobr>
+                </th>
+                <th>
+                  <nobr>换表原因</nobr>
+                </th>
+                <th>
+                  <nobr>其他备注</nobr>
+                </th>
+                <th>
+                  <nobr>换表人</nobr>
+                </th>
+                <th>
+                  <nobr>状态</nobr>
+                </th>
+                <th>
+                  <data-order field="f_operate_date" name="换表日期"></data-order>
+                </th>
+                <th>
+                  <nobr>人员</nobr>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>公司</nobr>
+                </th>
+                <th><nobr>附件</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>{{$index + 1}}</nobr></td>
+              <td style="text-align: center;"><nobr>
+                {{row.f_userinfo_code}}
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_changemeter_fee}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_remanent_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_remanent_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_othereason}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_change_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;"><nobr>
+                <button v-if="row.is_has_file=='是'" class="btn btn-link" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+              </nobr></td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+const myMap = new Map()
+let asyncReadyGen = async function (self) {
+  await self.initQueryParam()
+}
+export default {
+  'title': '',
+  data () {
+    return {
+      model: new PagedList('rs/sql/changemeterFiles', 20, {orderitem: '"f_operate_date DESC"'}),
+      pj: this.$appdata.getParam('是否有附件') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('是否有附件')] : [],
+      // 控制查询条件显示
+      searchshow: true,
+      curorgid: [this.$login.f.orgid],
+      criteriaShow: false,
+      f_orgid: '',
+      condition: '',
+      // 排序
+      orderitem: 'f_operate_date desc',
+      orderFields: {
+        f_operate_date: 'no'
+      },
+      // 控制样式
+      editList: false,
+      excelTable: true,
+      getfield: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户名称',
+        'f_address': '客户地址',
+        'f_type': '换表类型',
+        'f_changemeter_fee': '换表费',
+        'f_meternumber_old': '旧表号',
+        'f_meternumber': '新表号',
+        'f_meter_brand_old': '旧气表品牌',
+        'f_meter_brand': '新气表品牌',
+        'f_remanent_gas': '旧表剩余补气量',
+        'f_remanent_money': '旧表剩余金额',
+        'f_comments': '换表原因',
+        'f_othereason': '其他备注',
+        'f_change_operator': '换表人',
+        'f_state': '状态',
+        'f_operate_date': '换表日期',
+        'f_operator': '人员',
+        'f_depname': '所属部门',
+        'f_orgname': '所属公司',
+        'f_serial_number': '换表单号'
+      },
+      meterbrand: [],
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      whetherPay: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
+      da: {
+        rows: []
+      },
+      f_meternumber: ''
+    }
+  },
+  ready () {
+    asyncReadyGen(this)
+    this.search()
+    // this.getwarehouse()
+  },
+  props: ['showMessage'],
+  methods: {
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeid = val[0]
+    },
+    async getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+
+    },
+    initQueryParam () {
+      let arr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        arr.push(temp)
+      })
+      this.meterbrand = [{label: '全部', value: ''}, ...arr]
+    },
+    view (row) {
+      this.$parent.showupload = true
+      this.$parent.row = row
+    },
+    init () {
+      this.f_meternumber = ''
+      this.da.rows = []
+      myMap.clear()
+    },
+    cancelSet () {
+      this.showSetModal = false
+      this.init()
+    },
+
+    jump () {
+      this.joinshow2 = false
+      this.showSetModal = true
+    },
+    async getwarehouse () {
+
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    join1 (row) {
+      this.joinrow = row
+      this.joinshow = true
+    },
+
+    joinclose () {
+      this.joinshow = false
+    },
+    joinclose2 () {
+      this.joinshow2 = false
+    },
+
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+
+      this.search()
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    importFile () {
+      this.show = true
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      console.log('查询。。。', this.f_orgid)
+      if (!this.orgCondtionStr) {
+        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+      } else {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+      }
+      this.model.search(args.condition, args.model)
+      this.condition = args.condition
+    },
+    mergeRowData (joinrows) {
+
+    },
+    // 多选框初始化
+    selectInit () {
+      this.rowsdata = []
+      this.all = []
+      this.radio = []
+    },
+    select () {
+      let index = this.model1.pageIndex - 1
+      console.log('全选', this.all[index])
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (this.all[index]) {
+        // 数据
+        this.rowsdata[index] = Object.assign([], this.model1.rows)
+        // 勾选
+        for (var i = 0; i < this.model1.rows.length; i++) {
+          this.radio[index].$set(i, true)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index] = []
+        // 不勾选
+        for (var i = 0; i < this.model1.rows.length; i++) {
+          this.radio[index].$set(i, false)
+        }
+      }
+    },
+    selectOne (event, row, i) {
+      console.log('单选', event.target.checked)
+      let index = this.model1.pageIndex - 1
+      if (!this.rowsdata[index]) {
+        this.rowsdata[index] = []
+      }
+      if (!this.radio[index]) {
+        this.radio.$set(index, [])
+      }
+      if (event.target.checked) {
+        // 数据
+        this.rowsdata[index][i] = row
+        // 勾选
+        this.radio[index].$set(i, true)
+        // 判断是否全部选中
+        var allState = true
+        if (this.model1.rows.length != this.radio[index].length) {
+          allState = false
+        }
+        for (var state of this.radio[index]) {
+          if (!state) {
+            allState = false
+          }
+        }
+        if (allState) {
+          this.all.$set(index, true)
+        } else {
+          this.all.$set(index, false)
+        }
+      } else {
+        // 数据
+        this.rowsdata[index][i] = []
+        // 不勾选
+        this.radio[index].$set(i, false)
+        // 任意取消一个则全选状态设为false
+        this.all.$set(index, false)
+      }
+    }
+  },
+  computed: {
+    ischecked () {
+      return function (index, i) {
+        // console.log("计算属性")
+        if (!this.radio[index]) {
+          return false
+        }
+        return this.radio[index][i]
+      }
+    },
+    distributionstate () {
+      return [{label: '全部', value: ''}, {label: '待分配', value: 'is null'}, {label: '已入库', value: 'is not null'}]
+    }
+  }
+}
+</script>
+<style>
+.datapanel {
+  color: #333;
+  background-color: white;
+  padding: 10px 20px;
+  border-radius: 15px;
+}
+</style>

package/src/filiale/yuncheng/sale.js

@@ -51,4 +51,6 @@ export default function () {
   Vue.component('machine-down', (resolve) => { require(['./machineDown'], resolve) })
   // 获取气表信息
   Vue.component('meter-message', (resolve) => { require(['./MeterMessage'], resolve) })
+  // 换表记录维护列表
+  Vue.component('changemeter-list-maintain', (resolve) => { require(['./changemeterListMaintain'], resolve) })
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/xihu/sale'
+import FilialeSale from './filiale/fugou/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -24,6 +24,7 @@ system(false)
 sale()
 address()
 ldap()
+FilialeSale()
 require('system-clients/src/styles/less/bootstrap.less')
 
 new Vue({

package/src/plugins/LogicService.js

@@ -4,7 +4,7 @@ import co from 'co'
 let disableGen = function * (data) {
   let owe = yield Vue.resetpost('api/af-revenue/sql/getOverdue', {data: {f_userfiles_id: data.f_userfiles_id + ''}}, {resolveMsg: null, rejectMsg: null})
   console.log('表具停用看是否有欠费', owe.data)
-  let hasHandplan = yield Vue.resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
+  let hasHandplan = yield Vue.resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfiles_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
   console.log('是否有未抄表数据', hasHandplan.data)
   if (owe.data.length > 0 && hasHandplan.data.length > 0) {
     Vue.showAlert('该表具还有欠费或者未抄表数据，不能停用！！', 'danger', 0)