sale-client 3.5.76 → 3.5.77

package/package.json

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

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -5,6 +5,10 @@
         <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
       </div>
       <div class="auto ">
+        <div class="row">
+          <label class = "col-sm-5 " style="color: brown">团缴编号</label>
+          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >气表类型</label>
           <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -882,6 +882,9 @@ export default {
       this.commitflag = true
       // 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
       this.model.f_remanent_price = ((this.model.f_remanent_money) / (this.model.f_remanent_gas)).toFixed(4)
+      if (this.model.f_remanent_price == 'NaN') {
+        this.model.f_remanent_price = 0
+      }
     },
 
     async validateOwe () {

package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue

@@ -143,13 +143,13 @@
           <td style="text-align:center">{{ row.f_user_id }}</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" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_last_tablebase }}
           </td>
-          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_tablebase }}
           </td>
-          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_meter_base }}
           </td>
           <td style="text-align:center">{{ parseFloat(row.f_tablebase - row.f_last_tablebase).toFixed(2) }}</td>
@@ -168,7 +168,7 @@
           <td style="text-align:center">{{ row.f_audit_date }}</td>
           <td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
             <button type="button" class="button_search button_spacing width-60"
-                    v-if="row.f_last_tablebase === row.f_meter_base && row.f_last_tablebase !== row.f_tablebase "
+                    v-if="row.f_last_tablebase === row.f_meter_base"
                     @click.stop="$parent.$parent.$parent.success(row)">通过
             </button>
             <br>
@@ -216,7 +216,7 @@ let readyGen = async function (self) {
 
 export default {
   title: '自报表数审核',
-  data() {
+  data () {
     return {
       initres: {
         org: [this.$login.f.orgid],
@@ -236,24 +236,24 @@ export default {
       meterbooks: [{label: '全部', value: ''}]
     }
   },
-  ready() {
+  ready () {
     readyGen(this)
     this.$refs.paged.$refs.cri.model.f_hand_state[0] = ` f_meter_state = '待审核'`
   },
   methods: {
-    loadMeterBooks() {
+    loadMeterBooks () {
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
-    getRes(obj) {
+    getRes (obj) {
       this.orgCondtionStr = obj
     },
-    hidden() {
+    hidden () {
       this.criteriaShow = !this.criteriaShow
     },
-    search() {
+    search () {
       this.$refs.paged.$refs.cri.search()
     },
-    selfSearch(args) {
+    selfSearch (args) {
       if (!this.orgCondtionStr) {
         args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
       } else {
@@ -261,23 +261,25 @@ export default {
       }
       this.model.search(args.condition, args.model)
     },
-    async allsuccess() {
+    async allsuccess () {
       let res = await this.$showMessage('确定通过全部抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       let condition = []
       if (res === 'confirm') {
         if (this.model.rows.length >= 0) {
           if (this.model.model.f_hand_state[0] == `'待审核'`) {
             for (let i = 0; i < this.model.rows.length; i++) {
-              let temp = {
-                f_hand_id: this.model.rows[i].id,
-                // 本次表底数
-                f_tablebase: this.model.rows[i].f_tablebase,
-                // 表类型
-                f_meter_classify: this.model.rows[i].f_meter_classify,
-                // 气表品牌
-                f_meter_brand: this.model.rows[i].f_meter_brand
+              if (this.model.rows[i].f_last_tablebase === this.model.rows[i].f_meter_base) {
+                let temp = {
+                  f_hand_id: this.model.rows[i].id,
+                  // 本次表底数
+                  f_tablebase: this.model.rows[i].f_tablebase,
+                  // 表类型
+                  f_meter_classify: this.model.rows[i].f_meter_classify,
+                  // 气表品牌
+                  f_meter_brand: this.model.rows[i].f_meter_brand
+                }
+                condition.push(temp)
               }
-              condition.push(temp)
             }
             let uuid = this.$login.guid()
             let data = {
@@ -295,7 +297,7 @@ export default {
         }
       }
     },
-    async success(row) {
+    async success (row) {
       let res = await this.$showMessage('确定通过该条抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       if (res === 'confirm') {
         let data = {
@@ -313,7 +315,7 @@ export default {
         this.search()
       }
     },
-    async allfaild() {
+    async allfaild () {
       let res = await this.$showMessage('确定作废全部抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       let condition = '('
       if (res === 'confirm') {
@@ -335,7 +337,7 @@ export default {
         }
       }
     },
-    async faild(row) {
+    async faild (row) {
       let res = await this.$showMessage('确定作废该条抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       if (res === 'confirm') {
         // this.row = row
@@ -346,7 +348,7 @@ export default {
         this.search()
       }
     },
-    async confirm() {
+    async confirm () {
       await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       await this.$resetpost('http://www.hunanhongdaranqi.com/weixin/rs/logic/meterReadFailed', this.pushdata, {
         resolveMsg: null,
@@ -357,7 +359,7 @@ export default {
     }
   },
   computed: {
-    inputtores() {
+    inputtores () {
       // 获取抄表员
       console.log('获取抄表员', this.$login.f)
       let rs = []

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -0,0 +1,340 @@
+<template>
+  <div id="ChargeGroupList">
+    <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
+      <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">组织机构</label>
+                <res-select restype='organization'
+                            @res-select="$parent.$parent.getorg"
+                            :is-mul="false"
+                            :initresid='$parent.$parent.curorgid'>
+                </res-select>
+              </div>
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">客戶编码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
+                       condition="f_customer like '%{}%'" placeholder="客戶编码"/>
+              </div>
+              <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
+                <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 like '%{}%'" placeholder="客戶名称"/>
+              </div>
+
+              <div class="col-sm-3 form-group button-range">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
+                </button>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                     @click="criteriaShow = !criteriaShow"></div>
+              </div>
+              <div class="row" v-show="criteriaShow">
+                <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
+                  <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 like '%{}%'" placeholder="客戶名称"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客戶地址</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder="客戶地址"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客户电话</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">是否欠费</label>
+                  <v-select v-model="model.oughtfee"
+                            :search="fasle"
+                            placeholder='是否欠费'
+                            :value.sync="model.oughtfee"
+                            :options='$parent.$parent.oughtfee'
+                            condition="f_oughtfee_all {}"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
+          <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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{ $index + 1 }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_customer }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_name }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_balance }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_type }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_address }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_phone }}</nobr>
+              </td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
+                <button @click.stop="$parent.$parent.$parent.operate(row)"
+                        class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
+                </button>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.sumuserfiles }}</nobr>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.f_oughtfee_all }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.print(row)">打印明细
+                  </button>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.export(row)">导出明细
+                  </button>
+                </nobr>
+              </td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+      <print-data :sum-field="getfield" :model="printModel" :field="getfield" :printview="true"
+                  :defaultfield="defaultfield" titletable="团体欠费明细报表" v-ref:printdata>
+      </print-data>
+    </div>
+
+    <export-excel
+      :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
+      sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
+    </export-excel>
+
+    <owe-record-query v-if="oweShow" :row="row" :f_civill_id="f_civill_id"></owe-record-query>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      interval: null,
+      searchTime: this.$appdata.getSingleValue('磁条卡读卡间隔') ? this.$appdata.getSingleValue('磁条卡读卡间隔') : 2,
+      oughtfee: [{label: '全部', value: ''}, {label: '是', value: '> 0'}, {label: '否', value: '<= 0'}],
+      model: new PagedList('rs/sql/ncarchivesQuery', 20),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
+      f_civill_id: null,
+      oweShow: false,
+      getCondition: null,
+      getfield: null,
+      config: {
+        // 导出列
+        excelHeaders: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_address': '客户地址',
+          'f_user_phone': '客户电话',
+          //'f_meter_classify': '气表类型',
+          //'c': '欠费期数',
+          'f_hand_date': '欠费区间',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'price':'单价',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额'
+          //'f_debt_money': '已交金额',
+          //'f_oughtfee_new': '应交气费',
+          //'overdue': '滞纳金',
+          //'f_oughtfee_all': '合计欠费'
+        }
+      },
+      defaultfield: [],
+      printModel: new PagedList('rs/sql/batchOweQuery', 20),
+      row: null
+    }
+  },
+  title: '档案查询',
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    style: {
+      type: String,
+      default: 'col-sm-3 form-group'
+    },
+    // 控制在修改数据时显示少的查询条件,剩余隐藏
+    listShow: {
+      type: Boolean,
+      default: false
+    },
+    // 收费时的展示控制
+    chargeToChoose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  ready () {
+    this.getfield = this.config.excelHeaders
+    this.search()
+    this.readCiTiaoCard()
+  },
+  destroyed () {
+    clearInterval(this.interval)
+  },
+  watch: {
+    'oweShow' (val) {
+      if (val) {
+        clearInterval(this.interval)
+      } else {
+        this.readCiTiaoCard()
+      }
+    }
+  },
+  methods: {
+    async readCiTiaoCard () {
+      console.log('读磁条卡，开始，不停的循环')
+      let data = {}
+      let getUser = {data: []}
+      let forgid = this.$login.convertToIn([this.$login.f.orgid])
+      try {
+        // let res = {data:{Factory : 'CiTiao',CardID : '00000009'}}
+        let http = new HttpResetClass()
+        this.interval = setInterval(async () => {
+          // 1秒一轮回
+          http.load('POST', 'http://127.0.0.1:8003/ReadCard_HEC', data, {
+            resolveMsg: null,
+            rejectMsg: null
+          }).then(async res => {
+            if (res.data.CardID !== '') {
+              if (res.data.Err === null && res.data.Exception) {
+                this.$showAlert(res.data.Exception, 'danger', 2000)
+                // clearInterval(interval)
+              } else {
+                if (res.data.Factory === 'CiTiao') {
+                  // 获取用户信息
+                  getUser = await this.$resetpost('rs/sql/ncarchivesQuery', {
+                    data: {
+                      condition: `f_orgid  in ${forgid} and f_card_id='${res.data.CardID}'`,
+                      orderitem: `f_userinfo_id`
+                    }
+                  }, {resolveMsg: null, rejectMsg: '读卡失败'})
+                  this.showOwe(getUser.data[0])
+                  clearInterval(this.interval)
+                }
+              }
+            }
+          })
+        }, this.searchTime * 1000)
+      } catch (error) {
+        console.log('捕获到异常', error)
+        // this.$showAlert(error.data, 'danger', 2000)
+      }
+    },
+    // 打印
+    async print (row) {
+      let condition = `p.f_civill_id = ${row.id}`
+      await this.printModel.search(condition)
+      this.$refs.printdata.printData()
+    },
+    // 导出
+    export (row) {
+      this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
+      this.$refs.excel.exportExcel()
+    },
+    showOwe (row) {
+      if (this.chargeToChoose) {
+        this.f_civill_id = row.id
+        this.row = row
+        this.oweShow = true
+      }
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    add () {
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add')
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    operate (val) {
+      this.$dispatch('operate', val)
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
+      this.oweShow = false
+      this.model.search(args.condition, args.model)
+      if (this.$refs.paged.$refs.grid) this.$refs.paged.$refs.grid.selectInit()
+      this.$dispatch('newsearch')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+    }
+  }
+
+}
+</script>
+<style lang="less">
+  #ChargeGroupList {
+    .button_export {
+      display: none;
+    }
+  }
+</style>

package/src/filiale/qianneng/sale.js

@@ -72,6 +72,9 @@ let specialComp = {
 
   'userfiles-list': (resolve) => { require(['./archives/UserfilesList'], resolve) },
   // 用户基本信息
-  'user-base-info-new': (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfoNew'], resolve) }
+  'user-base-info-new': (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfoNew'], resolve) },
+
+  // 团体缴费查询列表
+  'charge-group-list': (resolve) => { require(['./chargeBatch/ChargeGroupList'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/tongchuan/FileUserFiles.vue

@@ -1120,7 +1120,7 @@ let loadParamGem = async function (self) {
           this.getuuid();
           if(this.uuida == '') return;
         // 当前上传的是批量导入的档案
-          let param = {
+          let batchParam = {
             filepath: res.f_downloadpath,
             f_operator: this.$login.f.name,
             f_operatorid: this.$login.f.id,
@@ -1130,10 +1130,20 @@ let loadParamGem = async function (self) {
             f_depname: this.$login.f.deps,
             uuid: this.uuida
           }
+          let jobParam = {
+            f_operatorid: this.$login.f.id,
+            total: 0,
+            operator: this.$login.f.orgs +":"+ this.$login.f.deps +":"+  Vue.$login.f.name,
+            jobType: "批量建档"
+          }
+          let param = {
+            jobParam: jobParam,
+            batchParam: batchParam
+          }
           let self = this
           try {
             self.progressShow = true;
-            axios.post('rs/logic/newSettleFileImport',
+            axios.post('rs/business/batchRunExcel/filemanage_fileSave/newSettleFileImport',
               {data: param}, {timeout: 1000}).then((res) => {
               })
             self.percent=0;

package/src/filiale/xinkang/UserBaseInfoNew.vue

@@ -0,0 +1,435 @@
+<template >
+  <div class="auto">
+  <div class="auto form-group-new row">
+    <div class="col-sm-6" style="height:auto;width:49%;">
+      <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;基本信息</p>
+      <!--    第一行数据-->
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户编号</label>
+          <input  class="input-underline" style="width:60%" :value="row.f_userinfo_code" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户姓名</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_name" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用户状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_state" readonly>
+        </div>
+        <div class="col-sm-8">
+          <label class="font_normal_body_new">客户地址</label>
+          <input class="input-underline" style="width:80%" :value="row.f_address" readonly>
+         </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户电话</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_phone" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_type" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用气性质</label>
+          <input class="input-underline" style="width:60%" :value="row.f_gasproperties" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">证件类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_credentials" readonly>
+        </div>
+        <div class="col-sm-8">
+          <label class="font_normal_body_new">证件号码</label>
+          <input class="input-underline" style="width:80%" :value="row.f_idnumber" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用户状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_state" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">账户余额</label>
+          <input class="input-underline" style="width:60%" :value="row.f_balance" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">人&ensp;口&ensp;数</label>
+          <input class="input-underline" style="width:60%" :value="row.f_people_num" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">关阀原因</label>
+          <input class="input-underline" style="width:60%" :value="row.f_info" readonly>
+        </div>
+    </div>
+    <div class="col-sm-6" style="height:auto;width:49%;">
+      <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;表具信息</p>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">表&emsp;号&emsp;</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meternumber" readonly>
+        </div>
+        <div class="col-sm-4">
+            <label class="font_normal_body_new">气表状态</label>
+            <input class="input-underline" style="width:60%" :value="row.f_table_state" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">当前底数</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meter_base" readonly>
+        </div>
+
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气表品牌</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meter_brand" readonly>
+        </div>
+
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气价名称</label>
+          <input class="input-underline" style="width:60%" :value="row.f_price_name" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气价类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_price_type" readonly>
+          </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">价格详情</label>
+          <input class="input-underline" style="width:60%" :value="row.f_detailprice" readonly>
+        </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new" title="最后上报时间">上报时间</label>
+        <input class="input-underline" style="width:60%" :value="row.f_meteread_date ? row.f_meteread_date : '暂无'" readonly>
+      </div>
+      <div v-if="row.f_collection_type == '按金额'"  class="col-sm-4">
+        <label class="font_normal_body_new">累购金额</label>
+        <input class="input-underline" style="width:60%" :value="row.total_fee" readonly>
+      </div>
+      <div v-if="row.f_collection_type == '按气量'">
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">累购气量</label>
+          <input class="input-underline" style="width:60%" :value="row.f_total_gas" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">最后结算时间</label>
+          <input class="input-underline" style="width:45%" :value="row.f_hand_date  ? row.f_hand_date :'暂无'" readonly>
+        </div>
+      </div>
+      <div v-if="row.f_meter_type.includes('物联网表')" >
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">物联网次数</label>
+          <input class="input-underline" style="width:55%" :value="row.f_iot_times" readonly>
+        </div>
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">表剩余金额</label>
+          <input class="input-underline" style="width:55%" :value="row.f_balance_amount" readonly>
+        </div>
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">阀门状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_valvestate == 0 ? '已开阀' : '已关阀'" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">累计上报次数</label>
+          <input class="input-underline" style="width:45%" :value="row.f_meteread_number ? row.f_meteread_number : 0" readonly>
+        </div>
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">是否自动阀控</label>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '否' : '是'" readonly>
+        </div>
+      </div>
+      <div v-if="row.f_collection_type == '按气量'" >
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">表剩余气量</label>
+          <input class="input-underline" style="width:55%" :value="row.f_balance_gas" readonly>
+        </div>
+        <div  class="col-sm-4">
+          <label class="font_normal_body_new">累计用气金额</label>
+          <input class="input-underline" style="width:45%" :value="row.f_total_usegas_amount" readonly>
+        </div>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">写卡次数</label>
+        <input class="input-underline" style="width:45%" :value="row.f_times" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">抄表册名</label>
+        <input class="input-underline" style="width:45%" :value="(row.f_book_code!=null ? '['+row.f_book_code + '] ' : '') + (row.f_book_name!=null ? row.f_book_name:'')" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">抄表册册序号</label>
+        <input class="input-underline" style="width:45%" :value="row.f_meter_book_sort" readonly>
+      </div>
+    </div>
+    <div class="auto" style="float: right;">
+      <button class="button_clear " @click="cancelmain()" >返回</button>
+      <button class="button_search" type="button" @click="goChargeManage">去收费</button>
+      <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
+              class="button_search" type="button" @click="clearBarrier">清除障碍</button>
+      <button v-if="row.f_meter_type.includes('物联网表')"
+              class="button_search" type="button" @click="openUser">开户</button>
+      <button v-if="row.f_meter_type.includes('物联网表')"
+              class="button_search" type="button" @click="valvecontrol">开关阀</button>
+      <button v-if="row.f_meter_type.includes('物联网表')"
+              class="button_search" type="button" @click="zdfk">开关自动阀控</button>
+      <div
+        :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"
+        @click="criteriaShow=!criteriaShow"
+        class="button_spacing"
+        style="float: right"></div>
+    </div>
+  </div>
+
+  <div class="auto row">
+    <div class="col-sm-6" style="width:49%;"></div>
+    <div class="auto form-group-new">
+    <div class="col-sm-6" style="height:auto;width:49%;" v-show="criteriaShow">
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">气表型号</label>
+        <input class="input-underline" style="width:60%" :value="row.f_meter_style" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">气表类型</label>
+        <input class="input-underline" style="width:60%" :value="row.f_meter_type" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">初始底数</label>
+        <input class="input-underline" style="width:60%" :value="row.f_initial_base" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">左&ensp;右&ensp;表</label>
+        <input class="input-underline" style="width:60%" :value="row.f_aroundmeter" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">建表日期</label>
+        <input class="input-underline" style="width:60%" :value="row.f_input_date.substring(0,7)" readonly>
+      </div>
+      <div  v-if="devices.length > 0" v-show="false" style="height: auto" >
+        <p style="font-weight: bold;margin: 0">设备信息</p>
+        <div class="panel-heading"  style="height: 30px">
+          <h4 style="display:inline-block;margin-top: auto">设备信息</h4>
+        </div>
+        <div v-for="device in devices">
+
+          <form class="form-horizontal">
+            <div class="col-sm-4">
+              <label class="font_normal_body_new">设备类型</label>
+              <input class="input-underline" style="width:60%" :value="device.f_devices_type" readonly>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body_new">设备品牌</label>
+              <input class="input-underline" style="width:60%" :value="device.f_brand" readonly>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body_new">设备型号</label>
+              <input class="input-underline" style="width:60%" :value="device.f_devices_model" readonly>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body_new">设备数量</label>
+              <input class="input-underline" style="width:60%" :value="device.f_devices_num" readonly>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+  </div>
+  <!--阀控管理弹框-->
+  <modal :show.sync="valve">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close()"><span>&times;</span></button>
+      <h4 class="modal-title" align="center">阀控管理</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group " style="padding-left: 8px">
+        <label  class="font_normal_body" :class="operateReason?'text-info':'text-danger'">操作原因</label>
+        <textarea class="form-control" style="width:80%" v-model="operateReason" rows="3" placeholder="请填写操作原因"></textarea>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button  type="button" class="button_search btn-ln fr" :disabled="!operateReason"  @click='valveoperate(true)'>开阀</button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <button  type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false)'>关阀</button>
+    </footer>
+  </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import Vue from 'vue'
+  export default {
+    title: '基本信息',
+    props: ['row'],
+    data () {
+      return {
+        criteriaShow: false,
+        devices: [],
+        valveLimit: false,
+        // 开关阀操作原因
+        operateReason: '',
+        valve: false
+      }
+    },
+
+    ready () {
+      this.getDevice()
+      this.valveLimit = this.$login.r.includes('开关阀权限')
+    },
+    methods: {
+      // 发送请求去数据
+      async getDevice () {
+        if (this.row) {
+          let http = new HttpResetClass()
+          let condition = `f_userinfo_id = '${this.row.f_userinfo_id}'`
+          let getDevices = await http.load('POST', 'rs/sql/sale_GetDevicesInfo', {data: {condition: condition}}, {rejectMsg: '获取设备信息出错！！', resolveMsg: null})
+          this.devices = getDevices.data
+        }
+      },
+
+      // 返回
+      cancelmain () {
+        this.$emit('cancel-main')
+      },
+      clearBarrier(){
+        // 地址
+        // 127.0.0.1:8445
+        // 参数
+        let datas =  {
+          moduleName:"XiMeiSystem", // 固定值
+          content:{
+            tradeCode:"3015",// 固定值
+            appid: "yysf", // 固定值
+            partner: "cqsemay_bcts", // 固定值
+            version:"v1", // 固定值
+            tasked:this.getuuid(), // 任务id
+            notifyUrl:"http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack", // 固定值
+            meterNo: this.row.f_meternumber,// 表号
+            signType:" MD5" //固定值
+          },
+          title: "清除异常", // 固定值
+          type: "清除异常", // 固定值
+          inputtor:this.row.f_operator, // 操作人
+          userId:this.row.f_userfiles_id,   // 表档案ID
+          dataId: null // 操作记录ID
+        }
+        this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+        })
+      },
+      getuuid(){
+        let uuidA = '';
+        var s = [];
+        var hexDigits = '0123456789abcdef';
+        for (var i = 0; i < 36; i++) {
+          s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+        }
+        s[14] = '4';
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+        s[8] = s[13] = s[18] = s[23] = '-';
+        uuidA = s.join('');
+        return uuidA;
+      },
+      async goChargeManage () {
+        await this.$copyText(this.row.f_userinfo_code)
+        this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      },
+      openUser () {
+        this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            let data = {
+              f_userfiles_id: this.row.f_userfiles_id
+            }
+            this.$resetpost('rs/logic/startup',data)
+          }
+        })
+      },
+      // 阀控管理
+      zdfk () {
+        let data = {
+          f_userfiles_id: this.row.f_userfiles_id
+        }
+        if (this.row.f_network_valve !== '1') {
+           this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+           this.row.f_network_valve = '1'
+        } else {
+            this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+            this.row.f_network_valve = null
+        }
+      },
+      // 阀控管理
+      valvecontrol () {
+        if (this.$login.r.includes('开关阀')) {
+          this.valve = true
+        } else {
+          this.$showAlert('您没有开关阀权限,请联系管理员！！', 'warning', 3000)
+        }
+      },
+      close () {
+        this.valve = false
+        this.operateReason = ''
+      },
+      // 开关阀操作
+      async valveoperate (oper) {
+        let msg = oper ? '开阀' : '关阀'
+        let datas = {
+          instructType: '阀门控制',
+          instructTitle: `手动${msg}`,
+          condition: `t_userfiles.f_userfiles_id='${this.row.f_userfiles_id}'`,
+          meterBrandName: this.row.f_alias,
+          f_instruct_state: '待发送',
+          inputtor: Vue.$login.f.name,
+          reasonInfo: this.operateReason,
+          meternumberf: this.row.f_meternumber,
+          contentData: {isOpen: oper ? 1 : 0}
+        }
+        await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
+          {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+            this.valve = false
+            this.operateReason = ''
+          })
+      }
+    },
+    watch: {
+      'row' () {
+        this.getDevice()
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  .form-group-new > div {
+    height: 3% !important;
+
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    height: auto;
+    border-radius:15px;
+  }
+  .text-info {
+    color: lightskyblue;
+  }
+  .text-danger {
+    color: red;
+  }
+  .input-underline {
+    border-bottom: 1px solid #dbdbdb;
+    border-top: 0px;
+    border-left: 0px;
+    border-right: 0px;
+  }
+  .font_normal_body_new {
+    font-weight: 100;
+    float: left;
+    margin-top: 0px;
+    font-size: 1.4rem !important;
+    line-height: 30px;
+  }
+
+  .col-sm-4,.col-sm-8{
+    display: flex;
+    align-items: center;
+    margin: 7px 0;
+
+    label{
+      line-height: unset;
+      margin-bottom: 0;
+    }
+  }
+</style>

package/src/filiale/xinkang/sale.js

@@ -5,6 +5,8 @@ let specialComp = {
   // 左侧用户基本信息展示
   'userinfo': (resolve) => { require(['./base/leftview/Userinfo'], resolve) },
   // 单个表具信息
-  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) }
+  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
+  //收费页面
+  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) }
 }
 exports.specialComp = specialComp