sale-client 3.5.51 → 3.5.52

package/package.json

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

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -52,6 +52,8 @@
                     </button>
                     <button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.createInfoForFile()">批量建档
                     </button>
+                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
+                    </button>
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
@@ -424,6 +426,17 @@ let loadParamGem = async function (self) {
         }
   },
       methods: {
+        downloadFiles(){
+          let downurl='rs/downloadfile/file?filename=预备户批量建档导入Excel模板';
+          this.$resetget(downurl,{}).then(res=>{
+            var link = document.createElement('a');
+            link.target="_blank"
+            link.href =downurl ;
+            link.setAttribute("download", "预备户批量建档导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
+            document.body.appendChild(link);
+            link.click();
+          })
+        },
         close () {
           this.printflag = false
           this.clean()

package/src/components/chargeBatch/ChargeGroupList.vue

@@ -162,11 +162,13 @@
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+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),
       // 公司下拉
@@ -222,8 +224,60 @@ export default {
   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}`

package/src/components/chargeBatch/OweRecordQuery.vue

@@ -70,7 +70,8 @@
         chargeShow: false,
         operBtns: [
           {name: '团体缴费', value: {routeName: 'batch-charge'}},
-          {name: '余额退款', value: {routeName: 'group-refund'}}
+          {name: '余额退款', value: {routeName: 'group-refund'}},
+          {name: '制磁条卡', value: {routeName: 'show-citiao_card'}}
         ]
       }
     },

package/src/components/revenue/changeInsurance/InsuranceList.vue

@@ -24,6 +24,8 @@
                 <div style="float: right">
                   <button class="button_search" @click="search()">查 询</button>
                   <button class="btn btn-default" @click="$parent.$parent.battchinsurance()" >批量保险收费</button>
+                  <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
+                  </button>
                   <div
                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                     @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -156,6 +158,17 @@
       this.search()
     },
     methods: {
+      downloadFiles(){
+        let downurl='rs/downloadfile/file?filename=批量保险收费导入Excel模板';
+        this.$resetget(downurl,{}).then(res=>{
+          var link = document.createElement('a');
+          link.target="_blank"
+          link.href =downurl ;
+          link.setAttribute("download", "批量保险收费导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
+          document.body.appendChild(link);
+          link.click();
+        })
+      },
       search () {
         this.$refs.paged.$refs.criteria.search()
       },

package/src/components/revenue/comprehen/Maintenance/group/AddWarehousemaingroup.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">操作记录</p>
+        <!-- <data-grid :model="inData" v-ref:grid  partial='list'>
+           <template partial='head'>-->
+        <table class="list_area table_sy" style="width: 600px">
+          <tr>
+            <th style="text-align: center">序号</th>
+            <th style="text-align: center">修改内容</th>
+            <th style="text-align: center">变更前</th>
+            <th style="text-align: center">变更后</th>
+            <th style="text-align: center">状态</th>
+            <th style="text-align: center">修改时间</th>
+            <th style="text-align: center">操作人</th>
+          </tr>
+
+          <tr v-for="row in recordlist">
+            <td style="text-align: center;">{{$index + 1}}</td>
+            <td style="text-align: center;">{{row.chinesename}}</td>
+            <td style="text-align: center;">{{row.oldvalue}}</td>
+            <td style="text-align: center;">{{row.newvalue}}</td>
+            <td style="text-align: center;">{{row.state}}</td>
+            <td style="text-align: center;">{{row.modifitime}}</td>
+            <td style="text-align: center;">{{row.operator}}</td>
+          </tr>
+        </table>
+      </form>
+
+    </validator>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'addwarehouse',
+
+    data () {
+      return {
+        inData: [],
+        obj: {},
+        userid: this.$login.f.id
+
+      }
+    },
+    props: {
+      recordlist: Array
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

package/src/components/revenue/comprehen/Maintenance/group/MeterOperatemaingroup.vue

@@ -0,0 +1,394 @@
+<template>
+  <div class="auto"  id="meterInfoTest">
+    <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)">
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户姓名</label>
+            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:收费状态, 权限:【收费记录状态修改】">收费状态</label>
+<!--            <input type="text" v-model="model.f_charge_state" disabled=disabled style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_state" v-model="model.f_state"
+                      :value-single="true"
+                      :search="false"
+                      :disabled="editstate"
+                      :options='positions' placeholder='收费状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">地&emsp;&emsp;址</label>
+            <input type="text" v-model="model.f_address" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <!--<div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户编号</label>
+            <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
+          </div>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+<!--            <input type="text" v-model="model.f_payment" style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_payment" v-model="model.f_payment"
+                      :options='payments' placeholder='付款方式'
+                      :value-single="true"
+                      :search="false"
+                      close-on-select>
+            </v-select>
+          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body" title="参数:写卡状态">写卡状态</label>-->
+<!--&lt;!&ndash;            <input type="text" v-model="model.f_write_card" style="width: 60%" class="input_search">&ndash;&gt;-->
+<!--            <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"-->
+<!--                      :options='writeCards' placeholder='写卡状态'-->
+<!--                      :value-single="true"-->
+<!--                      :search="false"-->
+<!--                      close-on-select>-->
+<!--            </v-select>-->
+<!--          </div>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">收款金额</label>
+            <input type="text" v-model="model.f_collection" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <!--<div class="col-sm-4 form-group">-->
+            <!--<label class="font_normal_body">收据类型</label>-->
+            <!--<input type="text" v-model="model.f_bill_style" style="width: 60%" class="input_search">-->
+          <!--</div>-->
+        </div>
+<!--        <div class="row">-->
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">转账单位</label>-->
+<!--            <input type="text" v-model="model.f_banktransfer_person" :disabled="!editbank" style="width: 60%" class="input_search">-->
+<!--          </div>-->
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">转账金额</label>-->
+<!--            <input type="text" v-model="model.f_banktransfer_money" :disabled="!editbank" style="width: 60%" class="input_search">-->
+<!--          </div>-->
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">转账日期</label>-->
+<!--&lt;!&ndash;            <input type="text" v-model="model.f_banktransfer_date" :disabled="!editbank" style="width: 60%" class="input_search">&ndash;&gt;-->
+<!--            <datepicker id="f_banktransfer_date" placeholder="转账日期" style="width:60%"-->
+<!--                        v-model="model.f_banktransfer_date"-->
+<!--                        :value.sync="model.f_banktransfer_date"-->
+<!--                        :format="'yyyy-MM-dd HH:mm:ss'"-->
+<!--                        :show-reset-button="true">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--        </div>-->
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">操作时间</label>
+            <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
+            <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
+                        v-model="model.f_operate_date"
+                        :value.sync="model.f_operate_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">财务核算日期</label>-->
+<!--            &lt;!&ndash;<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">&ndash;&gt;-->
+<!--            <datepicker id="f_delivery_date" placeholder="财务核算日期" style="width:60%"-->
+<!--                        v-model="model.f_accounting_date"-->
+<!--                        :value.sync="model.f_accounting_date"-->
+<!--                        :format="'yyyy-MM-dd HH:mm:ss'"-->
+<!--                        :show-reset-button="true">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">购气气量</label>
+            <input type="text" v-model="model.f_pregas" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">购气金额</label>
+            <input type="text" v-model="model.f_preamount" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:操作人员">操作人员</label>
+            <v-select :value.sync="model.f_operatorid"
+                      v-model="model.f_operatorid"
+                      :value-single="true"  @change="selectoperator()"
+                      :options='foperator'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属部门</label>
+            <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属公司</label>
+            <input type="text" v-model="model.f_orgname" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="打印格式">收据类型</label>
+            <v-select id="f_bill_style"
+                      placeholder='收据类型'
+                      :value-single="true"
+                      :value.sync="model.f_bill_style"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">开发票人</label>-->
+<!--            <input type="text" v-model="model.f_bill_operator" disabled=disabled  style="width: 60%" class="input_search">-->
+<!--          </div>-->
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">发票时间</label>-->
+<!--            <datepicker id="f_bill_date" placeholder="开发票时间" style="width:60%"-->
+<!--                        v-model="model.f_bill_date"-->
+<!--                        :value.sync="model.f_bill_date"-->
+<!--                        :format="'yyyy-MM-dd'"-->
+<!--                        :show-reset-button="true">-->
+<!--            </datepicker>-->
+<!--            &lt;!&ndash;<input type="text" v-model="model.f_bill_date"   style="width: 60%" class="input_search">&ndash;&gt;-->
+<!--          </div>-->
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">流&ensp;水&ensp;号</label>
+            <input type="text" v-model="model.f_serial_id" style="width: 60%" class="input_search">
+          </div>
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label class="font_normal_body">业务单号</label>-->
+<!--            <input type="text" v-model="model.f_serial_number" style="width: 60%" class="input_search">-->
+<!--          </div>-->
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">备注信息</label>
+            <input type="text" v-model="model.f_comments"  style="width: 85%" class="input_search">
+          </div>
+        </div>
+      </form>
+      <div style="float: right">
+        <button class="button_search" @click="save">保存</button>
+        <button class="button_clear" @click="cancel">取消</button>
+      </div>
+    </validator>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal  backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="model.f_userinfo_id"  :businessid="model.id" v-ref:upload  fusetype="团体收费" isremark="true" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <!--文件上传按钮-->
+<!--    <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>-->
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import * as Util from "../../../../../Util";
+  var data
+  let readyGen = async function (self) {
+    await  self.$LoadParams.loadParam(self.f_filialeid)
+    if (self.$GetSaleParam.inputtors.length <= 0) await self.$GetSaleParam.initinputtor()
+  }
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        // 构建数组来存储对象
+        editbank: true,
+        uploadText: '收费',
+        showfiles: false,
+        recordList: [],
+        foperator:[],
+        fileNameSet: {
+          'f_operatorid': '操作人员',
+          'f_payment': '收费形式',
+          'f_state': '是否有效',
+          'f_bill_style': '收据类型',
+          'f_operate_date': '收费日期',
+          'f_accounting_date': '财务核算日期',
+          'f_pregas': '购气气量',
+          'f_address': '地址',
+          'f_user_type': '用气性质',
+          'f_preamount': '充值金额',
+          'f_orgname': '所属公司',
+          'f_depname': '所属部门',
+          'f_user_name': '用户姓名',
+          'f_write_card': '写卡状态',
+          'f_banktransfer_person': '转账单位',
+          'f_banktransfer_money': '转账金额',
+          'f_banktransfer_date': '转账日期',
+          'f_comments': '备注信息',
+          'f_bill_date': '开票时间',
+          'f_bill_operator': '开票人',
+          'f_serial_id': '流水号',
+          'f_serial_number' : '业务单号'
+        },
+        editstate:true,
+      }
+    },
+    props: {
+      oldmodel: Object,
+      model: Object
+    },
+
+    ready () {
+      if (this.$login.r.includes('维护银行转账信息')) {
+        this.editbank = true
+      }
+      if(this.$login.r.includes('收费记录状态修改')){
+        this.editstate=false
+      }
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      this.model.f_bill_state = [this.oldmodel]
+      console.log('看看收费id', this.oldmodel)
+      readyGen(this)
+    },
+    created () {
+    },
+    methods: {
+      initoperator(){
+        this.foperator=[]
+          console.log("this.$login",this.$login,this.oldmodel,this.model)
+          let arr = this.$GetSaleParam.inputtors.filter((res) => {
+            if (res.rolestr != null && res.rolestr != '') {
+              return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
+            }
+          })
+          arr.forEach((res) => {
+            this.foperator.push({label: res.name, value: res.id})
+          })
+      },
+      selectoperator () {
+        let id = this.model.f_operatorid
+        if(!this.model.f_operatorid){
+          return
+        }
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/sql/saleSingleTable',
+          {data:{tablename: 't_user',
+          condition: `id = '${id}'`}},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            console.log('kanak,res', res)
+          if(res.data.length>0){
+            this.model.f_operator = res.data[0].name
+          }else{
+            this.model.f_operatorid=''
+            this.$showAlert('操作员信息未找到','warning',2000)
+          }
+            console.log('this.f_operatorid', this.model.f_operator)
+          })
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      uploadFiles () {
+        this.showfiles = !this.showfiles
+      },
+      addressValid (val) {
+      },
+      save () {
+        // console.log(this.model.key)
+        //
+        for (var item in this.model) {
+          if (this.model[item] != this.oldmodel[item] && this.model[item] !='s_timestamp') {
+            var car = {
+              chinesename: this.fileNameSet[item],
+              fieldname: item,
+              tablename: 't_sellinggasbatch',
+              oldvalue: this.oldmodel[item],
+              newvalue: this.model[item],
+              state: '有效',
+              modifitime: Util.toStandardTimeString(),
+              operator: this.$login.f.name,
+              sellingas_id: this.model.id,
+              join_id: this.model.id,
+              f_operator : this.$login.f.name,
+              f_operatorid : this.$login.f.id,
+              f_orgid : this.$login.f.orgid,
+              f_orgname : this.$login.f.orgs,
+              f_depid : this.$login.f.depids,
+              f_depname : this.$login.f.deps
+
+            }
+            this.recordList.push(car)
+            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+            console.log('看看car的值', car)
+          }
+        }
+        if (this.model.f_bill_date !== '' || this.model.f_bill_date === undefined) {
+          this.model.f_bill_operator = this.$login.f.name
+        }
+        this.$resetpost('rs/logic/saveGroupRecord', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
+          console.log('this.model', this.model)
+        })
+        this.$dispatch('close')
+      }
+    },
+    computed: {
+      positions () {
+        return this.$appdata.getParam('收费状态')
+      },
+      payments () {
+        return this.$appdata.getParam('付款方式查询')
+      },
+      writeCards () {
+        return this.$appdata.getParam('写卡状态')
+      },
+      billStyles () {
+        return this.$appdata.getParam('收据类型')
+      }
+    },
+    watch: {
+      'model'(){
+        this.initoperator()
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+#meterInfoTest{
+  #addboxmap {
+    height: 300px;
+  }
+  .glyphicon-map-marker:hover {
+    color: red;
+  }
+  .glyphicon-map-marker {
+    color: blue;
+    cursor: pointer;
+  }
+  .col-sm-4 {
+    .font_normal_body {
+      width: 73px;
+      overflow: auto;
+      white-space: nowrap;
+      // 指滚动条两边的按钮
+      &::-webkit-scrollbar-button {
+        display: none;
+      }
+      // 滚动条的宽度
+      &::-webkit-scrollbar {
+        width: 5px !important;
+        height: 5px !important;
+      }
+      // 滚动条的设置
+      &::-webkit-scrollbar-thumb {
+        background-color: #ddd;
+        background-clip: padding-box;
+      }
+      &::-webkit-scrollbar-thumb:hover {
+        background-color: #bbb;
+      }
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        background: #ededed;
+      }
+    }
+  }
+}
+</style>

package/src/components/revenue/comprehen/Maintenance/group/StockListmaingroup.vue

@@ -0,0 +1,477 @@
+<template>
+  <div>
+    <div style="flex: 1.5" class="flex">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
+                    v-show="$parent.searchshow">
+            <div novalidate class="form-inline auto" partial>
+              <div class="row">
+              <div
+                :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                class="form-group">
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
+              <div
+                :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                class="form-group">
+                <label class="font_normal_body">用户编号</label>
+                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
+                       condition="f_userinfo_code like '%{}%'" placeholder='用户编号'>
+              </div>
+              <div style="float:right;margin-top: 8px" class="span">
+<!--                <button class="button_spacing button_search" @click="$parent.$parent.updateAll()">批量维护</button>-->
+                <button class="button_spacing button_search" @click="search()">查 询</button>
+                <export-excel v-if="$parent.$parent.excelTable"
+                              class="auto"
+                              :data="{condition: $parent.$parent.condition}"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/saleExport" progress="saleGetExportProgress"  sql-name="sellinggasbatch"
+                              template-name='团缴记录'
+                              :choose-col="true"></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.hidden()"
+                  class="button_spacing"
+                  style="float: right"></div>
+              </div>
+              </div>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">收费编号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.id"
+                         condition="id = '{}'" placeholder='收费编号'>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">用户姓名</label>
+                  <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-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"-->
+<!--                  class="form-group" >-->
+<!--                  <label class="font_normal_body">有无附件</label>-->
+<!--                  <v-select :disabled=false-->
+<!--                            :options='$parent.$parent.pj'-->
+<!--                            :value-single="true"-->
+<!--                            :value.sync="model.is_has_file"-->
+<!--                            close-on-select-->
+<!--                            placeholder='请选择'-->
+<!--                            v-model="model.is_has_file"-->
+<!--                            condition="is_has_file = '{}'"-->
+<!--                            search=fasle-->
+<!--                  >-->
+<!--                  </v-select>-->
+<!--                </div>-->
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                            :options='$parent.$parent.usertypes' placeholder='客户类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_user_type = '{}'"></v-select>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
+                              :format="'yyyy-MM-dd 00:00:00'" condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                              :format="'yyyy-MM-dd 23:59:59'" condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
+            <template partial='head'>
+              <tr>
+<!--                <th>-->
+<!--                  <nobr>全选</nobr>-->
+<!--                  <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1' :checked="$parent.$parent.$parent.checked1"-->
+<!--                         @click="$parent.$parent.$parent.checkedALL()"></th>-->
+                <th><nobr>收费编号</nobr></th>
+                <th><nobr>用户编号</nobr></th>
+                <th><nobr>用户姓名</nobr></th>
+                <th><nobr>收费形式</nobr></th>
+                <th><nobr>是否有效</nobr></th>
+                <th><nobr>收据类型</nobr></th>
+                <th><nobr>收费时间</nobr></th>
+                <th><nobr>购气气量</nobr></th>
+                <th><nobr>地址</nobr></th>
+                <th><nobr>气量用途</nobr></th>
+                <th><nobr>用气金额</nobr></th>
+                <th><nobr>收费金额</nobr></th>
+                <th><nobr>操作员</nobr></th>
+                <th><nobr>所属部门</nobr></th>
+                <th><nobr>所属公司</nobr></th>
+<!--                <th><nobr>附件</nobr></th>-->
+              </tr>
+            </template>
+            <template partial='body'>
+<!--              <td style="text-align: center;">-->
+<!--                <input @keyup.enter="search" style="width:60%" type="checkbox" checked="checked" name="opertioninput"-->
+<!--                       @click="$parent.$parent.$parent.checked(row)"></td>-->
+              <td style="text-align: center;"><nobr>{{row.id}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+<!--              <td style="text-align: center;"><nobr>-->
+<!--                <button v-if="row.is_has_file=='是'" class="btn btn-link" @click.stop="$parent.$parent.$parent.view(row)">查看</button>-->
+<!--              </nobr></td>-->
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+  <modal  :show.sync="updateall" width="1200px" backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <h3 style="color:black" class="modal-title">批量维护</h3>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <validator name='v'>
+        <form class="form-horizontal  select-overspread">
+          <div class="row">
+            <div class="col-sm-6 form-input-group">
+              <label class="font_normal_body col-sm-3">财务核算日期</label>
+              <datepicker style="width:60%" placeholder="财务核算日期"
+                          v-model="updatemodel.f_accounting_date"
+                          :value.sync="updatemodel.f_accounting_date"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+          </div>
+        </form>
+      </validator>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button class="button_search btn-gn" @click="confirm">确认</button>
+      <button class="button_clear btn-gn" @click="cancel">取消</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+const myMap = new Map()
+
+  export default {
+    'title': '',
+    data () {
+      return {
+        usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
+        pj: this.$appdata.getParam('是否有附件') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('是否有附件')] : [],
+        model: new PagedList('rs/sql/sellinggasbatch', 20),
+        // model: new PagedList('rs/sql/singleTable_OrderBy', 20, {items: '"s.*,ui.f_userinfo_code"', tablename: '"t_sellinggas s left join t_userinfo ui on s.f_userinfo_id=ui.f_userinfo_id"', orderitem: '"f_delivery_date"'}),
+        // 控制查询条件显示
+        searchshow: true,
+        criteriaShow: false,
+        // 控制样式
+        editList: false,
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        excelTable: true,
+        condition: '',
+        getfield: {
+          'id': '收费编号',
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '用户姓名',
+          'f_payment': '收费形式',
+          'f_state': '是否有效',
+          'f_bill_style': '收据类型',
+          'f_operate_date': '收费时间',
+          'f_accounting_date': '财务核算时间',
+          'f_pregas': '购气气量',
+          'f_address': '地址',
+          'f_user_type': '气量用途',
+          'f_preamount': '用气金额',
+          'f_collection': '收费金额',
+          'f_operator': '操作员',
+          'f_depname': '所属部门',
+          'f_orgname': '所属公司'
+        },
+        f_orgid: '',
+        checked1: true,
+        map: new Map(),
+        updateall:false,
+        da: {
+          rows: []
+        },
+        f_meternumber: '',
+        updatemodel:{
+          f_accounting_date: this.$login.toStandardTimeString()
+        }
+      }
+    },
+    ready () {
+      this.search()
+      // this.getwarehouse()
+    },
+    events: {
+      'showfiles' (val) {
+        console.log(val)
+      }
+    },
+    props: ['showMessage'],
+    methods: {
+      updateAll(){
+        this.updateall = true
+      },
+      cancel(){
+        this.updateall = false
+        this.updatemodel = {
+          f_accounting_date: this.$login.toStandardTimeString()
+        }
+      },
+      async confirm(){
+        let array = []
+        this.map.forEach((value, key, map) => {
+          array.push(map.get(key))
+        })
+        console.log('asdasd',array)
+        if (array.length>0){
+          let condition = `id in (''`
+          array.forEach((row) => {
+            condition = condition+`,'${row.id}'`
+          })
+          condition = condition+ `)`
+
+          console.log('asdasd',condition)
+          await this.$resetpost('rs/logic/updatesellinggas',{updatemodel:this.updatemodel,condition:condition})
+          this.search()
+          this.cancel()
+        } else{
+          this.$showMessage('当前未勾选用户，将为所有查询出来的用户添加限购，确定要操作吗？', ['confirm', 'cancel']).then(async (res) => {
+            if (res === 'confirm') {
+              await this.$resetpost('rs/logic/updatesellinggas',{updatemodel:this.updatemodel,condition:this.condition})
+              this.search()
+              this.cancel()
+            }
+          })
+
+        }
+      },
+      checkedALL () {
+        this.checked1 = !this.checked1
+        let box = document.getElementsByName('opertioninput')
+        for (var i = 0; i < box.length; i++) {
+          box[i].checked = this.checked1
+        }
+      },
+      checked (val) {
+        let id = val.id
+        if (this.map.has(id)) {
+          this.map.delete(id)
+        } else {
+          this.map.set(id, {id: id})
+        }
+      },
+      mapset (array) {
+        this.map.clear()
+        for (let i = 0; i < array.length; i++) {
+          let id = array[i].id
+          this.map.set(id, {id: id})
+        }
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      view (row) {
+        this.$parent.showupload = true
+        this.$parent.row = row
+      },
+      init () {
+        this.f_meternumber = ''
+        this.da.rows = []
+        myMap.clear()
+      },
+      cancelSet () {
+        this.showSetModal = false
+        this.init()
+      },
+
+      jump () {
+        this.joinshow2 = false
+        this.showSetModal = true
+      },
+      async getwarehouse () {
+
+      },
+
+      join1 (row) {
+        this.joinrow = row
+        this.joinshow = true
+      },
+
+      joinclose () {
+        this.joinshow = false
+      },
+      joinclose2 () {
+        this.joinshow2 = false
+      },
+
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      importFile () {
+        this.show = true
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+        this.condition = args.condition
+      },
+      mergeRowData (joinrows) {
+
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      select () {
+        let index = this.model1.pageIndex - 1
+        console.log('全选', this.all[index])
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model1.rows)
+          // 勾选
+          for (var i = 0; i < this.model1.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model1.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        console.log('单选', event.target.checked)
+        let index = this.model1.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model1.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          // console.log("计算属性")
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      },
+      distributionstate () {
+        return [{label: '全部', value: ''}, {label: '待分配', value: 'is null'}, {label: '已入库', value: 'is not null'}]
+      }
+    },
+    watch: {
+      'model.pageIndex' () {
+        this.checked1 = false
+        this.mapset(this.model.rows)
+        this.checkedALL()
+      },
+      'model.rows' () {
+        this.checked1 = false
+        this.mapset(this.model.rows)
+        this.checkedALL()
+      },
+      'checked1' (val) {
+        if (val) {
+          this.mapset(this.model.rows)
+        } else {
+          this.map.clear()
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    padding: 10px 20px;
+    border-radius: 15px;
+  }
+</style>

package/src/components/revenue/comprehen/Maintenance/group/WareHouseOperationmaingroup.vue

@@ -0,0 +1,45 @@
+<template>
+  <div style="padding-right:25px;padding-left: 20px;">
+    <!--分配状态是全部-->
+    <tabset >
+      <tab header="具体信息">
+        <meter-operate-maintain-group :model="model" :oldmodel="oldmodel"></meter-operate-maintain-group>
+      </tab>
+      <tab header="操作记录">
+        <warehouse-add-maintain-group :recordlist="recordlist"></warehouse-add-maintain-group>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'WareHouseOperation',
+    data () {
+      return {
+        showupload: false
+      }
+    },
+    props: {
+      recordlist: Array,
+   //   row: Object,
+      model: Object,
+      oldmodel: Object
+    },
+    created () {
+    },
+    ready () {
+
+    },
+    methods: {
+    },
+    events: {
+      'showfiles' (val) {
+        console.log('events!!!!!!!!!!!!!', val)
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/components/revenue/comprehen/Maintenance/group/maintenancegroup.vue

@@ -0,0 +1,149 @@
+<template>
+  <div id="unit" class="row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}" style="height:98%">
+      <charge-list-maintain-group @select-changed="idsearch" :showMessage.sync="showAddMssage" v-if="stepControl"
+                  v-ref:stocklist></charge-list-maintain-group>
+    </div>
+    <div class="binary-right"  v-show="showItem">
+      <charge-operator-maintain-group :recordlist="recordlist" :model="model" :oldmodel="oldmodel" v-show="showItem"
+                            :f_distribution_state="f_distribution_state" :row="row" :rowsdata="rowsdata1"
+                            :warehousename="warehousename"></charge-operator-maintain-group>
+    </div>
+  </div>
+  <modal :show.sync="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+    <article slot="modal-body">
+      <upload :blodid="row.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" :businessid="row.id" fusetype="收费" isremark="false" style="width:auto" ></upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '团缴记录维护',
+    data () {
+      return {
+        showupload: false,
+        recordlist: [],
+        model: {},
+        oldmodel: {},
+        showAddMssage: false,
+        // 分配状态z
+        f_distribution_state: '',
+        // 单选数据
+        row: {},
+        // 多选数据
+        rowsdata: [],
+        rowsdata1: {},
+        stepControl: true,
+        warehousename: '',
+        showItem: false
+      }
+    },
+    created () {
+    },
+    ready () {
+      this.arrAddFun()
+    },
+    methods: {
+      arrAddFun () {
+        // 拓展数组去空值的方法
+        Array.prototype.removeEmpty = function () {
+          for (var i = 0; i < this.length; i++) {
+            if (this[i] == '' || typeof (this[i]) == 'undefined') {
+              this.splice(i, 1)
+              i--
+            }
+          }
+          return this
+        }
+      },
+      // 合并二维数组并去空
+      mergeRowData (rowsdata) {
+        let data = []
+        // 合并
+        for (let array of rowsdata) {
+          data.push.apply(data, array)
+        }
+        // 去空
+        data = data.removeEmpty()
+        this.rowsdata = data
+      },
+      selected (row) {
+        this.row = row.val
+      },
+      // changeDisplay () {
+      //   this.stepControl = !this.stepControl
+      //   this.$dispatch('change-state', '')
+      // },
+      join (rowsdata) {
+
+      },
+      idsearch (row) {
+        this.$refs.stocklist.editList = true
+        this.showAddMssage = true
+        this.showItem = true
+        this.model = JSON.parse(JSON.stringify(row.val))
+        this.oldmodel = JSON.parse(JSON.stringify(row.val))
+
+        this.getGroupData()
+      },
+      getGroupData () {
+        let data = {}
+
+        let condition = ' sellingas_id= ' + this.model.id
+        condition += " and tablename='t_sellinggasbatch'"
+        data.condition = condition
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/OperationRecord',
+          {data: data},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.recordlist = res.data
+          })
+      }
+    },
+    events: {
+      'change-state' (state) {
+        this.f_distribution_state = state
+        this.rowsdata1 = {}
+      },
+      'getwarehouse' (a) {
+        this.warehousename = a
+      },
+      'change-receive' (state) {
+        this.f_distribution_state = state
+      },
+      'change-state1' (state) {
+        console.log('选择分配状态', state)
+        this.rowsdata1 = {}
+      },
+      'select' (rowsdata) {
+        this.mergeRowData(rowsdata)
+      },
+      'join' (rowsdata) {
+        this.rowsdata1 = Object.assign({}, rowsdata)
+        console.log('111:', this.rowsdata1)
+      },
+      // 重新查询
+      'refresh' () {
+      },
+      'close' () {
+        this.$refs.stocklist.editList = false
+        this.showItem = false
+        this.$refs.stocklist.$refs.paged.$refs.criteria.search()
+        console.log('this.$refs', this.$refs)
+        console.log('showitem', this.showItem)
+      },
+      // 调拨组件选择调出仓库,根据选择仓库进行查询
+      'idsearch' (f_warehouse_id) {
+
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/sale.js

@@ -935,6 +935,17 @@ export default function (filiale) {
   // 交费操作记录
   Vue.component('warehouse-add-maintain', (resolve) => { require(['./components/revenue/comprehen/Maintenance/revenue/AddWarehousemain'], resolve) })
 
+  // ------团缴交费记录维护--------
+  Vue.component('maintenance-payment-records-group', (resolve) => { require(['./components/revenue/comprehen/Maintenance/group/maintenancegroup'], resolve) })
+  // 交费记录维护列表
+  Vue.component('charge-list-maintain-group', (resolve) => { require(['./components/revenue/comprehen/Maintenance/group/StockListmaingroup'], resolve) })
+  // 交费记录维护操作
+  Vue.component('charge-operator-maintain-group', (resolve) => { require(['./components/revenue/comprehen/Maintenance/group/WareHouseOperationmaingroup'], resolve) })
+  // 交费具体信息金额
+  Vue.component('meter-operate-maintain-group', (resolve) => { require(['./components/revenue/comprehen/Maintenance/group/MeterOperatemaingroup'], resolve) })
+  // 交费操作记录
+  Vue.component('warehouse-add-maintain-group', (resolve) => { require(['./components/revenue/comprehen/Maintenance/group/AddWarehousemaingroup'], resolve) })
+
   // 其他记录维护
   Vue.component('Other-record-maintenance', (resolve) => { require(['./components/revenue/comprehen/Maintenance/otherRecords/Otherrecordmaintenance.vue'], resolve) })
   // 其他记录维护列表