sale-client 3.6.384 → 3.6.385-2

package/package.json

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

package/src/components/revenue/comprehen/Maintenance/revenue/MeterOperatemain.vue

@@ -46,9 +46,9 @@
                       close-on-select>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">收款金额</label>
-            <input type="text" v-model="model.f_collection" disabled=disabled  style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_collection" :disabled="!editcollection" style="width: 60%" class="input_search">
           </div>
           <!--<div class="col-sm-4 form-group">-->
             <!--<label class="font_normal_body">收据类型</label>-->
@@ -97,20 +97,21 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">购气气量</label>
-            <input type="text" v-model="model.f_pregas" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_pregas" :disabled="!editcollection" style="width: 60%" class="input_search">
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">购气金额</label>
-            <input type="text" v-model="model.f_preamount" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_preamount" :disabled="!editcollection" style="width: 60%" class="input_search">
           </div>
         </div>
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护操作员权限】">
             <label class="font_normal_body" title="参数:操作人员">操作人员</label>
             <v-select :value.sync="model.f_operatorid"
                       v-model="model.f_operatorid"
+                      :disabled="!editoperator"
                       :value-single="true"  @change="selectoperator()"
                       :options='foperator'
                       close-on-select></v-select>
@@ -200,6 +201,8 @@ var data
         equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
         // 构建数组来存储对象
         editbank: true,
+        editcollection: false,
+        editoperator: false,
         uploadText: '收费',
         showfiles: false,
         recordList: [],
@@ -240,6 +243,12 @@ var data
       if (this.$login.r.includes('维护银行转账信息')) {
         this.editbank = true
       }
+      if (this.$login.r.includes('收费记录维护金额权限')) {
+        this.editcollection = true
+      }
+      if (this.$login.r.includes('收费记录维护操作员权限')) {
+        this.editoperator = true
+      }
       if (this.$login.r.includes('收费记录状态修改')) {
         this.editstate = false
       }

package/src/filiale/gehua/MeterHistory.vue

@@ -0,0 +1,74 @@
+<template>
+  <div class="auto" style="height: 500px">
+    <data-grid :model="model" class="list_area table_sy"  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>
+          <th><nobr>操作人</nobr></th>
+          <th><nobr>操作日期</nobr></th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align:center">{{row.f_type}}</td>
+          <td style="text-align:center">{{row.f_describe}}</td>
+          <td style="text-align:center">{{row.f_comments}}</td>
+          <td style="text-align:center">{{row.f_orgname}}</td>
+          <td style="text-align:center">{{row.f_depname}}</td>
+          <td style="text-align:center">{{row.f_operator}}</td>
+          <td style="text-align:center">{{row.f_operate_date}}</td>
+        </tr>
+      </template>
+      <template partial='foot'></template>
+    </data-grid>
+  </div>
+</template>
+<script>
+export default {
+  title: '详细信息',
+  data () {
+    return {
+      model: {
+        rows: []
+      }
+
+    }
+  },
+  props: ['row', 'id'],
+  ready () {
+    this.search()
+  },
+  methods: {
+    async search () {
+      // 获取这个气价的所有记录
+      console.log('气价记录', this.row)
+
+      let data = {
+        tablename: `t_meterinfo_operationlog`,
+        items: '*',
+        condition: '1=1',
+        orderitem: 'id'
+
+      }
+      if (this.id) {
+        data.condition = `f_meterinfo_id = '${this.id}'`
+      }
+
+      let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: data}, {rejectMsg: '获取气价记录出错', resolveMsg: null})
+
+      this.model.rows = res.data
+    }
+  },
+  watch: {
+    'row' () {
+      this.search()
+    }
+
+  }
+
+}
+</script>

package/src/filiale/gehua/WebMeterInfo.vue

@@ -0,0 +1,80 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main': !iseditmetetinfo,'binary-left': iseditmetetinfo}" :style="{width:iseditmetetinfo ? '50%' : '100%'}">
+      <web-meter-list style="width:auto;" :styles="iseditmetetinfo?'form-group col-sm-3':'form-group col-sm-2'" :showfields="iseditmetetinfo?false:true" v-ref:list  @dblclick="showeditinfo"></web-meter-list>
+    </div>
+    <div class="binary-right" style="width:50%" v-if="iseditmetetinfo" >
+      <edit-meter-info :oldmeter="row" v-if="ismeterinfo" :f_filialeid="f_filialeid" @close="closeedit" style="overflow-y: auto;"></edit-meter-info>
+
+      <use-web-meter :meterinfos="meterinfos"  v-if="isUseMeter" @close="closeedit" style="overflow-y: auto;"></use-web-meter>
+      <!--<ul class="nav nav-tabs">-->
+      <!--<li class="active"><a>操作历史</a></li>-->
+      <!--</ul>-->
+      <!--<meter-history :id="row.id" @close="closeedit" style="height:30%"></meter-history>-->
+    </div>
+  </div>
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import * as WebmeterUtil from '../../components/WebmeterUtil'
+import * as webMeterList from './WebMeterList'
+import * as meterHistory from './MeterHistory'
+import Vue from 'vue'
+
+export default {
+  components: {webMeterList, meterHistory},
+  title: '表计信息',
+  data () {
+    return {
+      model: new PagedList('rs/sql/singleTable_OrderBy', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
+      f_filialeid: '',
+      iseditmetetinfo: false,
+      row: {},
+      criteriaShow: false,
+      show: false,
+      isUseMeter: false,
+      meterinfos: [],
+      ismeterinfo: false
+    }
+  },
+  ready () {
+
+  },
+  methods: {
+    showeditinfo (obj) {
+      console.log('====================obj')
+      if (obj) {
+        this.row = obj
+        this.iseditmetetinfo = true
+        this.ismeterinfo = true
+        this.isUseMeter = false
+      }
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    clearmsg () {
+      this.$refs.paged.$refs.criteria.model = {}
+    },
+    closeedit () {
+      this.iseditmetetinfo = false
+      this.isUseMeter = false
+      this.ismeterinfo = false
+      this.$refs.list.search()
+    }
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+  padding: 10px 30px 10px 30px;
+  border-radius:15px;
+}
+</style>

package/src/filiale/gehua/WebMeterList.vue

@@ -0,0 +1,440 @@
+<template style="position: absolute;">
+  <div id="WebMeterList">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.selfSearch'>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row" width="100%">
+            <div :class="$parent.$parent.styles" >
+              <label class=" font_normal_body" >&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="row">
+
+
+              <div style="float:right">
+                <button class="button_search"  @click="search()" v-el:cba>查询</button>
+                <button class="button_search" @click="$parent.$parent.addmeter()">新增</button>
+                <button class="button_search" @click="$parent.$parent.useMeter()">领用</button>
+                <button class="button_export" @click="$parent.$parent.importFile">导入</button>
+                <export-excel :data="$parent.$parent.getCondition" :field="$parent.$parent.getfield" :choose-col="true" v-ref:excel attach="webmeterlist"
+                              sqlurl="rs/logic/saleExport" sql-name="webMeterInfo" template-name='表计信息导出'>
+                </export-excel>
+                <button  class="button_search" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载</button>
+                <button class="button_search" @click="$parent.$parent.clearmsg">清空</button>
+                <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >表计电话</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_meter_phone"
+                       condition="f_meter_phone='{}'" placeholder="表计电话">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;IMEI码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_imei"
+                       condition="f_imei='{}'" placeholder="IMEI码">
+              </div>
+              <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              <!--<div :class="$parent.$parent.styles">-->
+              <!--<label class="font_normal_body">组织机构</label>-->
+              <!--<res-select restype='organization'-->
+              <!--:is-mul="false"-->
+              <!--:initresid="$parent.$parent.curorgid"-->
+              <!--@res-select="$parent.$parent.getorgCur">-->
+              <!--</res-select>-->
+              <!--</div>-->
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">气表品牌</label>
+                <v-select
+                  placeholder='气表品牌'
+                  :value.sync="model.f_meter_brand"
+                  style="width:60%"
+                  v-model="model.f_meter_brand"
+                  :options='$parent.$parent.meterbrand'
+                  close-on-select
+                  condition="f_meter_brand='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">安装状态</label>
+                <v-select
+                  placeholder='安装状态'
+                  :value.sync="model.aa"
+                  style="width:60%"
+                  v-model="model.aa"
+                  :options='$parent.$parent.azstate'
+                  close-on-select
+                  condition="aa='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;批次&nbsp;&nbsp;&nbsp;</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_batch_number"
+                       condition="f_batch_number like '%{}%'" placeholder="批次">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">是否领用</label>
+                <v-select
+                  placeholder='是否领用'
+                  :value.sync="model.f_is_receive"
+                  style="width:60%"
+                  v-model="model.f_is_receive"
+                  :options='$parent.$parent.isreceived'
+                  close-on-select
+                  condition="f_is_receive='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;领用人</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_receive_unit"
+                       condition="f_receive_unit like '%{}%'" placeholder="领用人">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >领用电话</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_receive_phone"
+                       condition="f_receive_phone like '%{}%'" placeholder="领用电话">
+              </div>
+              <div :class="$parent.$parent.styles">
+                <label class="font_normal_body">领用日期</label>
+                <datepicker id="startDate" placeholder=""
+                            v-model="model.f_start_date"
+                            :value.sync="model.f_start_date"
+                            :disabled-days-of-Week="[]"
+                            style="width: 60%"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            condition="f_receive_date >= '{}'">
+                </datepicker>
+              </div>
+              <div :class="$parent.$parent.styles">
+                <label class="font_normal_body">&emsp;&emsp;至&emsp;</label>
+                <datepicker id="endDate" placeholder=""
+                            v-model="model.f_end_date"
+                            :value.sync="model.f_end_date"
+                            style="width: 60%"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            condition="f_receive_date <= '{}'">
+                </datepicker>
+              </div>
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid id="webmeterinfo" :model="model"  class="list_area table_sy"  partial='list'  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <input type="checkbox"  @click="$parent.$parent.$parent.addOrRemove()">
+            </th>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>表号</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>imei码</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>imsi码</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>批次</nobr></th>
+            <!--              <th><nobr>设备号</nobr></th>-->
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>表计电话</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>表通道类型</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>阀控标识</nobr></th>
+            <!--              <th><nobr>表通讯序号</nobr></th>-->
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>设备地址</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>终端名称</nobr></th>
+            <!--              <th><nobr>厂商代码</nobr></th>-->
+            <th><nobr>状态</nobr></th>
+            <th><nobr>气表品牌</nobr></th>
+
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>设备号</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>气表年限</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>生产日期</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>批次号</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>气表厂家</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><nobr>采购人</nobr></th>
+            <th v-if="$parent.$parent.$parent.showfields"><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 style="text-align:center">
+            <input type="checkbox" v-model="$parent.$parent.$parent.$parent.meterinfos" :disabled="row.f_receive==='已领用'" :value="row" @click="$parent.$parent.$parent.checkboxMeter()" >
+          </td>
+          <td style="text-align: center;" >{{$index+1}}</td>
+          <td style="text-align: center" >{{row.f_meternumber}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_imei}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_imsi}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_batch_number}}</td>
+          <!--            <td style="text-align: center" >{{row.f_device_id}}</td>-->
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_meter_phone}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_iot_type}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_valvemark}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_device_address}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_terminal_id}}</td>
+          <!--            <td style="text-align: center" >{{row.f_vender}}</td>-->
+
+          <td style="text-align: center" >{{row.aa}}</td>
+          <td style="text-align: center" >{{row.f_meter_brand}}</td>
+
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_device_id}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_years}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_manufacture_date}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_batch_number}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_manufacturers}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_purchaser}}</td>
+          <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_purchase_date}}</td>
+          <td style="text-align: center" >{{row.f_receive}}</td>
+          <td style="text-align: center" >{{row.f_receive_unit}}</td>
+          <td style="text-align: center" >{{row.f_receive_date}}</td>
+          <td style="text-align: center" >{{row.f_receive_date}}</td>
+
+
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                   action="rs/file/uploadFile" tagname="导入表计" v-ref:file :headers="headers" multiple></file-upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import * as WebmeterUtil from '../../components/WebmeterUtil'
+import Vue from 'vue'
+
+let readyGen = async function (self) {
+  await self.$LoadParams.loadParam()
+  self.initQueryParam()
+  // self.reflash()
+}
+
+export default {
+  title: '表计管理',
+  props:['showfields','styles'],
+  data () {
+    return {
+      getCondition: null,
+      getfield: null,
+      meterbrand: [],
+      azstate: [{label: '全部', value: ''}, {label: '已安装', value: '已安装'}, {label: '未安装', value: '未安装'}],
+      isreceived:[{label: '全部', value: ''}, {label: '已领用', value: '是'}, {label: '未领用', value: '否'}],
+      // curorgid: [this.$login.f.orgid],
+      orgCondtionStr: '',
+      // 公司下拉
+      initres: {
+        org: [],
+        dep: [],
+        user: []
+      },
+      model: new PagedList('rs/sql/webMeterInfo', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
+      headers: {'username': Vue.$login.f.name, 'blodid': WebmeterUtil.guid()},
+      criteriaShow: false,
+      f_orgid: '',
+      show: false,
+      meterinfos: [],
+      isAddOrMove: false
+    }
+  },
+  ready () {
+    this.loadGetField()
+    this.search()
+    readyGen(this)
+    this.$parent.meterinfos = []
+    console.log('this', this)
+    this.$refs.paged.$refs.criteria.model.f_table_state = ['正常']
+    this.$refs.paged.$refs.criteria.search()
+  },
+
+  methods: {
+    async getRes (condition, obj) {
+      this.orgCondtionStr = condition
+    },
+    loadGetField () {
+      this.getfield = {
+        'f_meternumber': '表号',
+        'f_imei': 'imei码',
+        'f_imsi': 'imsi码',
+        'f_meter_phone': '表计电话',
+        'f_iot_type': '表通道类型',
+        'f_valvemark': '阀控标识',
+        'f_device_address': '设备地址',
+        'f_terminal_id': '终端名称',
+        'aa': '状态',
+        'f_meter_brand': '气表品牌',
+        'f_device_id': '设备号',
+        'f_years': '气表年限',
+        'f_manufacture_date': '生产日期',
+        'f_batch_number': '批次号',
+        'f_manufacturers': '气表厂家',
+        'f_purchaser': '采购人',
+        'f_purchase_date': '采购时间',
+        'f_receive': '是否领用',
+        'f_receive_unit': '领用人',
+        'f_receive_date': '领用时间',
+      }
+    },
+    downloadFiles(){
+      let downurl='rs/downloadfile/file?filename=表计导入模板';
+      this.$downFile(downurl,'表计导入模板.xlsx')
+    },
+    addOrRemove () {
+      this.$parent.meterinfos = []
+      if (this.isAddOrMove) {
+        this.$parent.meterinfos = []
+      } else {
+        this.model.rows.forEach((row) => {
+          if (row.f_receive !== '已领用') {
+            this.$parent.meterinfos.push(row)
+          }
+        })
+      }
+      this.isAddOrMove = !this.isAddOrMove
+    },
+    useMeter () {
+      console.log("meterinfos",this.$parent.meterinfos)
+      this.$parent.iseditmetetinfo = true
+      this.$parent.isUseMeter = true
+      this.$parent.ismeterinfo = false
+      console.log("1",this.$parent.iseditmetetinfo)
+      console.log("2",this.$parent.ismeterinfo)
+      console.log("3",this.$parent.isUseMeter)
+    },
+    checkboxMeter () {
+      console.log("这是当前页的meterinfos",this.meterinfos)
+      console.log("这是当前页的meterinfos",this.$parent.meterinfos)
+    },
+    initQueryParam () {
+      let arr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        //  if(item.value.f_meter_type==='物联网表'){
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        arr.push(temp)
+        // }
+      })
+      this.meterbrand = [{label: '全部', value: ''}, ...arr]
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    addmeter () {
+      this.$parent.row = {}
+      this.$parent.iseditmetetinfo = true
+      this.$parent.ismeterinfo = true
+      this.$parent.isUseMeter = false
+      this.$parent.f_filialeids = this.f_filialeids
+    },
+    clearmsg () {
+      this.$refs.paged.$refs.criteria.model = {}
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.$parent.meterinfos = []
+      if (!this.f_orgid) {
+        this.f_orgid = this.$login.f.orgid
+      }
+      let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_filialeid in ('" + this.f_orgid + "')"
+      args.condition = `${args.condition} ` + f_orgstr
+      // if (this.f_orgid) {
+      //   args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
+      // }
+      this.getCondition = {condition: args.condition}
+      this.model.search(args.condition, args.model)
+    },
+
+    getorgCur (val) {
+      console.log('组织事件返回。。', val[0])
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.$parent.f_filialeid = val[0]
+      this.search()
+    },
+    importFile () {
+      this.show = true
+    }
+
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      console.log(this.$login.f, '======')
+      console.log(res)
+
+      let data = {
+        tablename: 't_meterinfo',
+        filepath: res.f_downloadpath,
+        info: {
+          f_orgid: this.$login.f.orgid ? this.$login.f.orgid : '',
+          f_orgname: this.$login.f.orgs ? this.$login.f.orgs : '',
+          f_depid: this.$login.f.depids ? this.$login.f.depids : '',
+          f_depname: this.$login.f.deps ? this.$login.f.deps : '',
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_filialeid: this.f_orgid === '' ? this.$login.f.orgid : this.f_orgid.replace(/[^0-9]/ig, '')
+        }
+      }
+
+      console.log(data, '++++++++++++++++++++++++++')
+      this.$resetpost('rs/logic/iot_meterinfo_import', {data: data}, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+        let mes = '成功导入' + res.data.successnum + '条数据 '
+        let failedCount = res.data.allnum - res.data.successnum
+
+        if (failedCount > 0) {
+          mes += '，有 ' + failedCount + ' 条数据导入失败'
+
+          if (res.data.duplicate && res.data.duplicate.length > 0) {
+            mes += '。因为表号或IMEI重复而导入失败的数据，信息为：'
+            let duplicateInfo = res.data.duplicate.map(item =>
+              `行号: ${item.row_number}, 表号: ${item.f_meternumber}, IMEI: ${item.f_imei}`
+            ).join('\n')
+            mes += '\n' + duplicateInfo
+          }
+
+          var link = document.createElement('a')
+          let path = '表具导入异常信息.txt'
+          let pathName = 'http://' + location.host + '/excel/' + path
+          link.href = pathName
+          link.download = path
+          link.dispatchEvent(new MouseEvent('click'))
+          mes += '。请确保气表品牌存在，且表号、IMEI号唯一，详细信息请查看表具导入异常信息.txt'
+        }
+        this.$showMessage(mes)
+        this.search()
+      })
+    }
+  }
+}
+</script>
+<style lang="less">
+#WebMeterList {
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+  }
+  #webmeterinfo {
+    tr > td {
+      white-space: nowrap;
+    }
+  }
+  #vc-exportexcel-webmeterlist {
+    margin: 0;
+  }
+}
+
+</style>

package/src/filiale/gehua/sale.js

@@ -113,4 +113,7 @@ export default function () {
   Vue.component('new-price-adjustment-webmeter', (resolve) => { require(['./NewPriceAdjustmentWebmeter'], resolve) })
   Vue.component('new-price-adjustment-manage', (resolve) => { require(['./PriceAdjustmentManage'], resolve) })
   Vue.component('owe-record-query', (resolve) => { require(['./PriceChangeCompensation/OweRecordQuery'], resolve) })
+
+  // 表计管理
+  Vue.component('web-meter-info', (resolve) => { require(['./WebMeterInfo'], resolve) })
 }

package/src/filiale/qingtongxia/MeterOperatemain.vue

@@ -46,9 +46,9 @@
                       close-on-select>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">收款金额</label>
-            <input type="text" v-model="model.f_collection" disabled=disabled  style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_collection" :disabled="!editcollection"  style="width: 60%" class="input_search">
           </div>
           <!--<div class="col-sm-4 form-group">-->
             <!--<label class="font_normal_body">收据类型</label>-->
@@ -97,21 +97,21 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">购气气量</label>
-            <input type="text" v-model="model.f_pregas" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_pregas" :disabled="!editcollection" style="width: 60%" class="input_search">
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
             <label class="font_normal_body">购气金额</label>
-            <input type="text" v-model="model.f_preamount" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_preamount" :disabled="!editcollection" style="width: 60%" class="input_search">
           </div>
         </div>
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护操作员权限】">
             <label class="font_normal_body" title="参数:操作人员">操作人员</label>
             <v-select :value.sync="model.f_operatorid"
                       v-model="model.f_operatorid"
-                      disabled=disabled
+                      :disabled="!editoperator"
                       :value-single="true"  @change="selectoperator()"
                       :options='foperator'
                       close-on-select></v-select>
@@ -201,6 +201,8 @@ var data
         equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
         // 构建数组来存储对象
         editbank: true,
+        editcollection: false,
+        editoperator: false,
         uploadText: '收费',
         showfiles: false,
         recordList: [],
@@ -241,6 +243,12 @@ var data
       if (this.$login.r.includes('维护银行转账信息')) {
         this.editbank = true
       }
+      if (this.$login.r.includes('收费记录维护金额权限')) {
+        this.editcollection = true
+      }
+      if (this.$login.r.includes('收费记录维护操作员权限')) {
+        this.editoperator = true
+      }
       if (this.$login.r.includes('收费记录状态修改')) {
         this.editstate = false
       }

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('rs/logic/runSQL', data)
       this.model = {
-        f_third_pay: '0',
+        f_third_pay: '1',
         f_time_type: '按月',
         f_limit_times: '',
         f_time_value: '',

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/qingjian/sale'
+import FilialeSale from './filiale/rongchuang/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'