manage-client 3.1.22 → 3.1.26

package/src/components/sale/config/DefaultPrint.js

@@ -1,6 +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"
-  ]
-}
+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"
+  ]
+}

package/src/components/sale/config/exportConfig.js

@@ -3,7 +3,8 @@ import OnTimePressureRegulatorStation from "../../scada/OnTimePressure/OnTimePre
 export default{
   // 把打印需要默认选中的字段名放在config数组中
   userConfig: { 'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_user_phone': '客户电话',
-    'f_idnumber': '身份证号','f_balance': '账户余额','f_address': '客户地址','f_residential_area': '小区',
+    'f_idnumber': '身份证号','f_balance': '账户余额','f_user_level':'客户等级','f_user_type':'用户类型',
+    'f_address': '客户地址','f_residential_area': '小区',
     'f_building': '楼栋','f_unit': '单元','f_floor': '楼层','f_room': '门牌号',
     'f_user_state': '客户状态','f_createfile_date': '建档日期','f_createfile_person': '建档人','f_comments': '备注'
     ,'f_bank_accopen':'银行户名','f_bank_name':'银行名称','f_bank_account':'银行账号','f_inputtor': '抄表员',
@@ -111,6 +112,14 @@ export default{
     'f_hand_num': '实抄户数', 'f_hand_lv': '抄表率', 'f_oughtamount': '期间抄表气量', 'f_oughtfee': '期间抄表金额',
     'f_debt_money': '期间实收气费金额', 'f_sell_hand': '已收户数', 'f_sell_lv': '收费率'
   },
+
+  ProceedsOperConfig: {
+    'f_operate_date': '日期', 'c': '售气笔数', 'f_pregas': '售气气量', 'f_preamount': '售气金额',
+    'f_wmoney': '维护费', 'f_balance': '上期结余', 'f_curbalance': '本期结余', 'f_delaypay': '气费滞纳金',
+    'fkcardnum': '发卡数', 'f_fkcardfees': '发卡费', 'f_gmoney': '工本费', 'cardnum': '补卡数',
+    'f_cardfees': '补卡费', 'sumall': '小计'
+  },
+
   arrearsConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_residential_area': '小区名称', 'f_address': '客户地址',
     'f_user_phone': '客户电话','f_rent_phone': '备用电话','f_inputtor': '抄表员','f_book_name': '抄表册','f_user_type': '客户类型',

package/src/components/sale/config/tableConfig.js

@@ -1,48 +1,48 @@
-export default{
-  //查询页面的字段名和中文对应
-  ReportDataQuery:
-    {
-      "用户编号":"f_userinfo_code",
-      "用户名称":"f_user_name",
-      "表号":"f_meternumber",
-      "本次抄表底数":"f_tablebase",
-      "上次抄表底数":"f_last_tablebase",
-      "表计剩余余额":"f_jval",
-      "抄表日期":"f_hand_date",
-
-      "上次抄表日期":"f_last_hand_date",
-      "开户日期":"f_gas_date",
-      "软件版本号":"f_software_version",
-      "表状态信息":"f_table_msg",
-      "上次表状态信息":"f_last_meter_state_msg",
-
-      "插入日期":"f_insert_date",
-      "上次插入日期":"f_last_insertdate",
-      "是否结算":"f_whether_clear",
-      "超用气量":"f_super_gas",
-      "电量等级":"f_electricity",
-
-      "购气次数":"f_times",
-      "单价":"f_price",
-      "信号强度":"f_signal",
-      "信噪比":"f_snr",
-      "电压":"f_batterylevel",
-
-      "阀门强制状态":"f_networkshutvalve",
-      "阀门状态":"f_valvestate",
-      "计量类型":"f_wmprepaytype",
-      "上报类型":"f_upload_type",
-      "金额状态":"f_moneystate",
-
-      "电压状态":"f_lowlithiumbattery",
-      "磁干扰异常":"f_magneticinterference",
-      "表内剩余金额":"f_meterbalanceamt",
-      "表内累计充值金额":"f_meterdebitamt",
-      "补偿状态":"f_compensatestate",
-      "气表品牌":"f_meter_brand",
-      "气表型号":"f_meter_style",
-      "分公司":"f_orgname"
-
-    }
-
-}
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "表号":"f_meternumber",
+      "本次抄表底数":"f_tablebase",
+      "上次抄表底数":"f_last_tablebase",
+      "表计剩余余额":"f_jval",
+      "抄表日期":"f_hand_date",
+
+      "上次抄表日期":"f_last_hand_date",
+      "开户日期":"f_gas_date",
+      "软件版本号":"f_software_version",
+      "表状态信息":"f_table_msg",
+      "上次表状态信息":"f_last_meter_state_msg",
+
+      "插入日期":"f_insert_date",
+      "上次插入日期":"f_last_insertdate",
+      "是否结算":"f_whether_clear",
+      "超用气量":"f_super_gas",
+      "电量等级":"f_electricity",
+
+      "购气次数":"f_times",
+      "单价":"f_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "电压状态":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/components/sale/filesquery/UserQuery.vue

@@ -56,6 +56,13 @@
                               condition="f_user_state = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户类型</label>
+                    <v-select :value.sync="model.f_user_type"
+                              v-model="model.f_user_type" condition="f_user_type = '{}'"
+                              :options='$parent.$parent.userTypes' placeholder='请选择'
+                              close-on-select></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
@@ -295,6 +302,9 @@
                   <th>
                     <nobr>客户等级</nobr>
                   </th>
+                  <th>
+                    <nobr>用户类型</nobr>
+                  </th>
                   <th>
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -380,6 +390,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_level}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_type}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -890,6 +903,9 @@
       },
       userLevels () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
+      },
+      userTypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       }
     }
   }

package/src/components/sale/filesquery/detail/UserBaseInfo.vue

@@ -1,69 +1,69 @@
-<template>
-  <div class="auto">
-    <form novalidate class="form-horizontal">
-      <div class="row" :model="model">
-        <div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">客户编号:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_userinfo_code" disabled/>
-          </div>
-        </div><div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">公司ID:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_filialeids" disabled/>
-          </div>
-        </div>
-        <div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">客户名称:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_user_name" disabled/>
-          </div>
-        </div>
-        <div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">客户电话:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_user_phone" disabled/>
-          </div>
-        </div>
-        <div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">证件号码:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_idnumber" disabled/>
-          </div>
-        </div>
-        <div class="form-group form-input-group col-sm-4">
-          <label class=" col-sm-2 font_normal_body">地址:</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control col-sm-2"  v-model="model.f_address" disabled/>
-          </div>
-        </div>
-
-      </div>
-    </form>
-  </div>
-</template>
-
-<script>
-  let getData
-  let getUserinfoGen = async function (self){
-
-    let getUser = await self.$resetpost('rs/sql/newuserinfoQuery',
-      {data:{condition:`f_userinfo_code = '${getData.f_userinfo_code}' and f_filialeids = '${getData.f_filialeids}'`}},{resolveMsg: null, rejectMsg: null})
-
-    self.model = getUser.data[0]
-  }
-
-  export default {
-    title: '客户基本信息',
-    data () {
-      return {
-        model:{}
-      }
-    },
-    props: ['data'],
-    ready () {
-      getData = this.data
-      getUserinfoGen(this)
-    }
-  }
-</script>
+<template>
+  <div class="auto">
+    <form novalidate class="form-horizontal">
+      <div class="row" :model="model">
+        <div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">客户编号:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_userinfo_code" disabled/>
+          </div>
+        </div><div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">公司ID:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_filialeids" disabled/>
+          </div>
+        </div>
+        <div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">客户名称:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_user_name" disabled/>
+          </div>
+        </div>
+        <div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">客户电话:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_user_phone" disabled/>
+          </div>
+        </div>
+        <div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">证件号码:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_idnumber" disabled/>
+          </div>
+        </div>
+        <div class="form-group form-input-group col-sm-4">
+          <label class=" col-sm-2 font_normal_body">地址:</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control col-sm-2"  v-model="model.f_address" disabled/>
+          </div>
+        </div>
+
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+  let getData
+  let getUserinfoGen = async function (self){
+
+    let getUser = await self.$resetpost('rs/sql/newuserinfoQuery',
+      {data:{condition:`f_userinfo_code = '${getData.f_userinfo_code}' and f_filialeids = '${getData.f_filialeids}'`}},{resolveMsg: null, rejectMsg: null})
+
+    self.model = getUser.data[0]
+  }
+
+  export default {
+    title: '客户基本信息',
+    data () {
+      return {
+        model:{}
+      }
+    },
+    props: ['data'],
+    ready () {
+      getData = this.data
+      getUserinfoGen(this)
+    }
+  }
+</script>

package/src/components/sale/filesquery/detail/UserDetail.vue

@@ -1,41 +1,41 @@
-<template>
-  <div class="auto">
-    <modal :show.sync="data.show" :width='1000' title='客户详情' v-ref:modal backdrop="false">
-      <article slot="modal-body">
-        <div class="flex">
-          <user-base-info :data="data"></user-base-info>
-          <user-oper-info :data="data"></user-oper-info>
-        </div>
-      </article>
-      <footer slot="modal-footer">
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-  import UserBaseInfo from './UserBaseInfo'
-  import UserOperInfo from './UserOperInfo'
-
-  export default {
-    title: '客户详情',
-    components: {
-      UserBaseInfo,UserOperInfo
-    },
-    data () {
-        return {
-          //data: this.data
-        }
-    },
-    props: ['data'],
-    ready () {
-      console.log('客户详情，，，', this.data)
-    },
-    methods: {
-
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="auto">
+    <modal :show.sync="data.show" :width='1000' title='客户详情' v-ref:modal backdrop="false">
+      <article slot="modal-body">
+        <div class="flex">
+          <user-base-info :data="data"></user-base-info>
+          <user-oper-info :data="data"></user-oper-info>
+        </div>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import UserBaseInfo from './UserBaseInfo'
+  import UserOperInfo from './UserOperInfo'
+
+  export default {
+    title: '客户详情',
+    components: {
+      UserBaseInfo,UserOperInfo
+    },
+    data () {
+        return {
+          //data: this.data
+        }
+    },
+    props: ['data'],
+    ready () {
+      console.log('客户详情，，，', this.data)
+    },
+    methods: {
+
+    },
+    computed: {
+
+    }
+  }
+</script>

package/src/components/sale/filesquery/detail/UserOperInfo.vue

@@ -1,76 +1,76 @@
-<template>
-  <div class="flex-row auto">
-    <div class="flex" style="width: 10%">
-      <div v-for="val in details">
-        <button class="btn btn-info" @click="buttonControl(val)">{{val}}</button>
-      </div>
-    </div>
-    <div style="width: 100%;overflow: auto">
-      <!--抄表信息-->
-      <sell-oper :data="data" v-if="sell"></sell-oper>
-      <!--换表信息-->
-      <hand-oper :data="data" v-if="hand"></hand-oper>
-      <!--换表信息-->
-      <exchange :data="data" v-if="exchange"></exchange>
-      <!--其他收费信息-->
-      <other-charge :data="data" v-if="othercharge"></other-charge>
-      <!--补卡信息-->
-      <replace-card :data="data" v-if="replacecard"></replace-card>
-      <!--变更信息-->
-      <change-message :data="data" v-if="changemessage"></change-message>
-      <!--操作信息-->
-      <handle-message :data="data" v-if="handlemessage"></handle-message>
-      <!--过户信息-->
-      <transfer-message :data="data" v-if="transfermessage"></transfer-message>
-    </div>
-  </div>
-</template>
-
-<script>
-  import SellOper from './oper/SellOper'
-  import HandOper from './oper/HandOper'
-  import Exchange from './oper/ExchangeOper'
-  import OtherCharge from './oper/OtherCharge'
-  import ReplaceCard from './oper/ReplaceCard'
-  import ChangeMessage from './oper/ChangeMessage'
-  import HandleMessage from './oper/HandleMessage'
-  import TransferMessage from './oper/TransferMessage'
-
-  export default {
-    title: '客户基本信息',
-    components: {
-      SellOper, HandOper, Exchange, OtherCharge, ReplaceCard, ChangeMessage, HandleMessage, TransferMessage
-    },
-    data () {
-      return {
-        details: ['收费明细', '抄表明细', '换表信息', '其他收费', '补卡信息', '变更信息', '操作信息', '过户信息'],
-        sell: false,
-        hand: false,
-        exchange: false,
-        othercharge: false,
-        replacecard: false,
-        changemessage: false,
-        handlemessage: false,
-        transfermessage: false
-       // data: this.data
-      }
-    },
-    props: ['data'],
-    ready () {
-      this.buttonControl('收费明细')
-    },
-    methods: {
-      buttonControl (val) {
-        this.sell = val === '收费明细'
-        this.hand = val === '抄表明细'
-        this.exchange = val === '换表信息'
-        this.othercharge = val === '其他收费'
-        this.replacecard = val === '补卡信息'
-        this.changemessage = val === '变更信息'
-        this.handlemessage = val === '操作信息'
-        this.transfermessage = val === '过户信息'
-      }
-    }
-  }
-
-</script>
+<template>
+  <div class="flex-row auto">
+    <div class="flex" style="width: 10%">
+      <div v-for="val in details">
+        <button class="btn btn-info" @click="buttonControl(val)">{{val}}</button>
+      </div>
+    </div>
+    <div style="width: 100%;overflow: auto">
+      <!--抄表信息-->
+      <sell-oper :data="data" v-if="sell"></sell-oper>
+      <!--换表信息-->
+      <hand-oper :data="data" v-if="hand"></hand-oper>
+      <!--换表信息-->
+      <exchange :data="data" v-if="exchange"></exchange>
+      <!--其他收费信息-->
+      <other-charge :data="data" v-if="othercharge"></other-charge>
+      <!--补卡信息-->
+      <replace-card :data="data" v-if="replacecard"></replace-card>
+      <!--变更信息-->
+      <change-message :data="data" v-if="changemessage"></change-message>
+      <!--操作信息-->
+      <handle-message :data="data" v-if="handlemessage"></handle-message>
+      <!--过户信息-->
+      <transfer-message :data="data" v-if="transfermessage"></transfer-message>
+    </div>
+  </div>
+</template>
+
+<script>
+  import SellOper from './oper/SellOper'
+  import HandOper from './oper/HandOper'
+  import Exchange from './oper/ExchangeOper'
+  import OtherCharge from './oper/OtherCharge'
+  import ReplaceCard from './oper/ReplaceCard'
+  import ChangeMessage from './oper/ChangeMessage'
+  import HandleMessage from './oper/HandleMessage'
+  import TransferMessage from './oper/TransferMessage'
+
+  export default {
+    title: '客户基本信息',
+    components: {
+      SellOper, HandOper, Exchange, OtherCharge, ReplaceCard, ChangeMessage, HandleMessage, TransferMessage
+    },
+    data () {
+      return {
+        details: ['收费明细', '抄表明细', '换表信息', '其他收费', '补卡信息', '变更信息', '操作信息', '过户信息'],
+        sell: false,
+        hand: false,
+        exchange: false,
+        othercharge: false,
+        replacecard: false,
+        changemessage: false,
+        handlemessage: false,
+        transfermessage: false
+       // data: this.data
+      }
+    },
+    props: ['data'],
+    ready () {
+      this.buttonControl('收费明细')
+    },
+    methods: {
+      buttonControl (val) {
+        this.sell = val === '收费明细'
+        this.hand = val === '抄表明细'
+        this.exchange = val === '换表信息'
+        this.othercharge = val === '其他收费'
+        this.replacecard = val === '补卡信息'
+        this.changemessage = val === '变更信息'
+        this.handlemessage = val === '操作信息'
+        this.transfermessage = val === '过户信息'
+      }
+    }
+  }
+
+</script>

package/src/components/sale/filesquery/detail/oper/ChangeMessage.vue

@@ -1,46 +1,46 @@
-<template>
-  <div class="auto">
-    <criteria-paged :model="model" v-ref:paged>
-      <data-grid  :model="model" partial='list' v-ref:grid >
-        <template partial='head'>
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>下发时间</nobr></th>
-            <th><nobr>抄表时间</nobr></th>
-            <th><nobr>上期底数</nobr></th>
-            <th><nobr>本期底数</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td ><nobr>{{$index + 1}}</nobr></td>
-          <td ><nobr>{{row.f_hand_date}}</nobr></td>
-          <td ><nobr>{{row.f_input_date}}</nobr></td>
-          <td ><nobr>{{row.f_last_tablebase}}</nobr></td>
-          <td ><nobr>{{row.f_tablebase}}</nobr></td>
-        </template>
-        <template partial='foot'>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    title: '抄表明细',
-    data () {
-      return {
-        model: new PagedList('rs/sql/newhandplanQuery', 15,{})
-      }
-    },
-    props: ['data'],
-    ready () {
-      console.log('抄表明细查询',this.data)
-      //u.f_userinfo_code=${data.f_userinfo_code} and h.f_filialeids = ${data.f_filialeids}
-      this.model.search(`f_userinfo_code='${this.data.f_userinfo_code}' and f_filialeids = '${this.data.f_filialeids}'`)
-    }
-  }
-
-</script>
+<template>
+  <div class="auto">
+    <criteria-paged :model="model" v-ref:paged>
+      <data-grid  :model="model" partial='list' v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>下发时间</nobr></th>
+            <th><nobr>抄表时间</nobr></th>
+            <th><nobr>上期底数</nobr></th>
+            <th><nobr>本期底数</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td ><nobr>{{$index + 1}}</nobr></td>
+          <td ><nobr>{{row.f_hand_date}}</nobr></td>
+          <td ><nobr>{{row.f_input_date}}</nobr></td>
+          <td ><nobr>{{row.f_last_tablebase}}</nobr></td>
+          <td ><nobr>{{row.f_tablebase}}</nobr></td>
+        </template>
+        <template partial='foot'>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: '抄表明细',
+    data () {
+      return {
+        model: new PagedList('rs/sql/newhandplanQuery', 15,{})
+      }
+    },
+    props: ['data'],
+    ready () {
+      console.log('抄表明细查询',this.data)
+      //u.f_userinfo_code=${data.f_userinfo_code} and h.f_filialeids = ${data.f_filialeids}
+      this.model.search(`f_userinfo_code='${this.data.f_userinfo_code}' and f_filialeids = '${this.data.f_filialeids}'`)
+    }
+  }
+
+</script>