sale-client 3.5.296 → 3.5.298

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.60.63:8800/', 'http://121.36.60.63:8800/']
+const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -132,7 +132,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 4]" disabled>
+                     v-scale="[model.f_collection, 4]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -229,6 +229,7 @@
         f_depname: self.$login.f.deps,
         f_comments: self.model.f_comments,
         times: self.row.f_iot_times,
+        bothGasFee: self.config.bothGasFee,
         // 额外判断
         f_collection_type: self.row.f_collection_type,
         f_calculation: self.row.f_calculation
@@ -300,6 +301,7 @@
           notShowFormula: false, // 不显示计算公式,默认显示
           hasPrint: false,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
+          bothGasFee: false, // 默认 false 金额表加金额 气量表加气量
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '现金缴费'
@@ -404,13 +406,15 @@
         this.$dispatch('refresh')
       },
       calRemanentMoney () {
+        console.log('======', this.row)
         // 计算 应补金额
         let getResult = this.$CommonService.calRemanentMoney(this.row)
         if (this.showGas) {
           this.model.f_pregas = this.model.f_fill_gas = getResult
-          this.model.f_preamount = 0
+          this.model.f_preamount = this.config.bothGasFee ? (this.model.f_pregas * this.row.f_remanent_price).toFixed(this.row.f_isdecimal === '否' ? 0 : 4) : 0
         } else {
           this.model.f_preamount = this.model.f_fill_money = getResult
+          this.model.f_pregas = this.config.bothGasFee ? ((this.model.f_preamount - 0) / (this.row.f_remanent_price - 0)).toFixed(this.row.f_isdecimal === '否' ? 0 : 4) : 0
         }
       },
       openExplain () {

package/src/filiale/rizhao/FilesManage/UserEssentialInfoTest.vue

@@ -327,10 +327,11 @@
       'confirmaddress' (res) {
         console.log('选定地址', res)
         this.showselectaddress = false
-        this.addressinfo.f_address = res.f_residential_area +
-          res.f_building + res.f_building_suffix +
-          res.f_unit + res.f_unit_suffix + res.f_floor +
-          res.f_floor_suffix + res.f_room + res.f_room_suffix
+        this.addressinfo.f_address = res.f_address
+        // this.addressinfo.f_address = res.f_residential_area +
+        //   res.f_building + res.f_building_suffix +
+        //   res.f_unit + res.f_unit_suffix + res.f_floor +
+        //   res.f_floor_suffix + res.f_room + res.f_room_suffix
         console.log('详细地址信息：' + this.addressinfo.f_address)
         this.addressinfo.id = res.id
         this.$dispatch('defaultOtheret', res)

package/src/filiale/rizhao/UserEssentialInfoTest.vue

@@ -310,10 +310,11 @@
         'confirmaddress' (res) {
             //  console.log('选定地址', res)
           this.showselectaddress = false
-          this.addressinfo.f_address = res.f_residential_area +
-            res.f_building + res.f_building_suffix +
-            res.f_unit + res.f_unit_suffix + res.f_floor +
-            res.f_floor_suffix + res.f_room + res.f_room_suffix
+          this.addressinfo.f_address = res.f_address
+          // this.addressinfo.f_address = res.f_residential_area +
+          //   res.f_building + res.f_building_suffix +
+          //   res.f_unit + res.f_unit_suffix + res.f_floor +
+          //   res.f_floor_suffix + res.f_room + res.f_room_suffix
           this.addressinfo.id = res.id
           if (res.f_house_type != null) {
             this.baseinfo.base.f_house_type = res.f_house_type

package/src/filiale/shanxian/GasPriceList.vue

@@ -0,0 +1,323 @@
+<template>
+  <div @keyup.enter="search" class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+          <div class="row">
+            <div  :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <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 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价名称</label>
+              <input class="input_search" condition="f_price_name like '%{}%'" placeholder='气价名称' style="width:60%" type="text"
+                     v-el:qjmc v-model="model.f_price_name" v-next-el="cx"
+              >
+            </div>
+            <!--<div class="col-sm-4">-->
+              <!--<label class="font_normal_body">生效时间大于</label>-->
+              <!--<datepicker :format="'yyyy-MM-dd'"-->
+                          <!--:value.sync="model.performDate"-->
+                          <!--placeholder="生效日期"-->
+                          <!--condition="performDate > '{}'"-->
+                          <!--v-model="model.performDate" style="width: 55%">-->
+              <!--</datepicker>-->
+            <!--</div>-->
+            <div class="form-group col-sm-6 button-range" style="margin-right: 10px" >
+              <button @click="$parent.$parent.batchAdjust()" class="button_new button_spacing"  v-if="$parent.$parent.buttonShow">批量调价</button>
+              <button @click="$parent.$parent.search()" class="button_search button_spacing" v-el:cx>查询</button>
+              <button @click="$parent.$parent.add()" class="button_new button_spacing">新增</button>
+
+              <div :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价编号</label>
+              <input type="number" class="input_search"  style="width: 60%" v-model="model.f_user_name" placeholder='气价编号'
+                     condition="f_price_id = '{}'" >
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价来源</label>
+              <v-select :value.sync="model.f_custom" v-model="model.f_custom"
+                        placeholder='气价来源' :options="$parent.$parent.custom"
+                        condition="custom = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange()"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价类型</label>
+              <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                        placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                        condition="f_price_type = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价状态</label>
+              <v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
+                        placeholder='气价状态' :options="$parent.$parent.price_states"
+                        condition="f_price_state = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
+          </div>
+        </div>
+
+      </criteria>
+      <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 v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>气价名称</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>客户类型</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>用气性质</nobr>
+            </th>
+            <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
+              <nobr>气价类型</nobr>
+            </th>
+            <th>
+              <nobr>最新版本</nobr>
+            </th>
+            <th>
+              <nobr>气价信息</nobr>
+            </th>
+            <th>
+              <nobr>使用分公司</nobr>
+            </th>
+            <th>
+              <nobr>使用户数</nobr>
+            </th>
+            <th>
+              <nobr>气价状态</nobr>
+            </th>
+            <th v-if="$parent.$parent.$parent.config.audit">
+              <nobr>操作</nobr>
+            </th>
+            <th>
+              <nobr>历史记录</nobr>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center">{{$index + 1}}</td>
+            <td style="text-align:center">{{row.f_price_id}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>
+            <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_price_type}}</td>
+            <td style="text-align:center">{{row.new_version}}</td>
+            <td style="text-align:center"><nobr>{{row.f_value}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_filiale_name}}</nobr></td>
+            <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.f_price_id,row.f_price_name,row.f_filialeid)" class="btn btn-link"><b>{{row.usercount}}</b></button></td>
+            <td style="text-align:center">{{row.f_price_state}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.config.audit">
+              <button :disabled="$login.r.includes('气价审核')" @click.stop="$parent.$parent.$parent.passPrice(row)"
+                      class="btn btn-link" v-if="row.f_state === '待审核'">通过
+              </button>
+            </td>
+            <td style="text-align: center;">
+              <button type="button" name="button" class="button_search-2 button_spacing width-60"
+                      @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :backdrop="false" :show.sync="show" v-if="show" width="1000px">
+      <header class="modal-header" slot="modal-header">
+        <button @click="show=!show" class="close" type="button"><span>&times;</span></button>
+        <h4 class="modal-title">历史记录</h4>
+      </header>
+      <article class="modal-body"  slot="modal-body"  style="height:100%;width:100%"  title="历史记录">
+        <price-change-history :row="row"  :show.sync="show"  @select-changed="historySeleted" v-on:toggle="close"></price-change-history>
+      </article>
+      <footer class="modal-footer" slot="modal-footer">
+
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  /**
+   *阶梯气价查询列表
+   */
+  import {PagedList} from 'vue-client'
+  import Vue from 'vue'
+
+  let passGen = async function (self, row) {
+    let param = {
+      id: row.id,
+      userid: self.$login.f.id
+    }
+    await self.$resetpost('rs/logic/priceNextFlow', param, {
+      warnMsg: `确定要通过气价名称为: ${row.f_price_name}的气价吗？`,
+      resolveMsg: '审核通过',
+      rejectMsg: '流程进行出错！！！'
+    })
+    self.$dispatch('success')
+  }
+
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/getGasPriceInfo', 20, {performDate: 'this.model.performDate', orderitem: `'${this.orderitem}'`}),
+        show: false,
+        criteriaShow: false,
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        row: {},
+        f_orgid: '',
+        gasproperties: [],
+        custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
+        price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
+        usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
+      }
+    },
+    props: {
+      orderitem: {
+        type: String,
+        default: 'f_price_id'
+      },
+      row: {},
+      config: {},
+      ispartial: false,
+      f_filialeid: {
+        type: String
+      },
+      buttonShow: false
+    },
+    ready () {
+      this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
+      this.getButtonShow()
+      this.search()
+    },
+    methods: {
+      getButtonShow () {
+        console.log('看看用户的权限：', this.$login.r)
+        if (this.$login.r.find(value => value == '展示批量调价')) {
+          this.buttonShow = true
+        }
+      },
+      batchAdjust () {
+        this.$parent.usershow = true
+        this.$parent.priceid = null
+        this.$parent.priceorgid = null
+      },
+      showhistory (row) {
+        this.show = true
+        this.row = row
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      operate (id, pricename, orgid) {
+        this.$parent.usershow = true
+        this.$parent.priceid = id
+        this.$parent.pricename = pricename
+        this.$parent.priceorgid = orgid
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('search')
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+        }
+        this.$refs.paged.$refs.grid.$el.scrollTop = 0
+        this.model.search(args.condition, args.model)
+      },
+      add () {
+        this.$dispatch('add')
+      },
+      passPrice (row) {
+        console.log('气价审核通过。。。', row, this.$refs.paged.$refs.grid.selected)
+        let selectedRow = this.$refs.paged.$refs.grid.selected
+        if (selectedRow) {
+          if (row.id !== selectedRow.id && selectedRow.f_state === '待审核') {
+            this.$showAlert('您通过的气价信息不是您选中的信息', 'warning', 3000)
+          } else {
+            passGen(this, row)
+          }
+        } else {
+          passGen(this, row)
+        }
+      },
+      historySeleted () {
+
+      }
+
+    },
+    watch: {
+      'model.rows.length' (val) {
+        if (val === 1) {
+          this.$refs.paged.$refs.grid.select(this.model.rows[0])
+          this.$parent.usershow = false
+        }
+      }
+    },
+    computed: {
+      pricetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      bookstates () {
+        return [ {label: '有效', value: "= '有效'"}, {label: '无效', value: "= '无效'"} ]
+      }
+    }
+  }
+</script>

package/src/filiale/shanxian/OtherChargeNew.vue

@@ -446,6 +446,7 @@ export default {
       }
     },
     setTypenumber (val,index) {
+      this.model.otherdetail[index].f_typenumber = ''
       this.model.otherdetail[index].typenumberList = this.$appdata.getParam(val.f_typename[0 ])
       this.model.otherdetail[index].f_unitprice = ''
     },

package/src/filiale/shanxian/StockListmain.vue

@@ -0,0 +1,591 @@
+<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()" v-if="$parent.$parent.buttonShow">批量维护</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="singlling"
+                                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>
+                <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_meternumber }}</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.idnumber }}</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_accounting_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/singlling', 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_meternumber': '表号',
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户姓名',
+        'idnumber': '证件号码',
+        '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()
+      },
+      buttonShow: false
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    // this.search()
+    // this.getwarehouse()
+    this.getButtonShow()
+  },
+  events: {
+    'showfiles' (val) {
+      console.log(val)
+    }
+  },
+  props: ['showMessage'],
+  methods: {
+    getButtonShow () {
+      if (this.$login.r.find(value => value == '展示批量维护')) {
+        this.buttonShow = true
+      }
+    },
+    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.$refs.paged.$refs.criteria.model.startDate) {
+        this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      }
+      if (!this.$refs.paged.$refs.criteria.model.endDate) {
+        this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      }
+      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/filiale/shanxian/UserDeviceInfoTest.vue

@@ -140,6 +140,10 @@
 <!--                            :options='installtype' placeholder='安装方式' :value-single="true"-->
 <!--                            close-on-select></v-select>-->
 <!--                </div>-->
+                <div style="" class="col-sm-6 form-group">
+                  <label for="f_comments" class="font_normal_body ">设备位置</label>
+                  <input class="input_search" style="width:60%" v-model="row.f_install_position"/>
+                </div>
                 <div style="" class="col-sm-6 form-group">
                   <label for="f_comments" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;注</label>
                   <input class="input_search" style="width:60%" v-model="row.f_comments"/>
@@ -244,7 +248,6 @@
               </tr>
               <tr style="text-align: center" v-for="row in devicesinfo">
                 <td style="text-align: center;">{{$index + 1}}</td>
-
                 <td style="text-align: center">{{row.f_devices_type}}</td>
                 <td style="text-align:center">{{row.f_devices_no}}</td>
                 <td style="text-align: center">{{row.f_brand}}</td>
@@ -257,6 +260,7 @@
                 <td style="text-align:center">{{row.f_input_date}}</td>
                 <td style="text-align:center">{{row.f_make_date}}</td>
                 <td style="text-align:center">{{row.f_userinfodevices_state}}</td>
+                <td style="text-align:center">{{row.f_install_position}}</td>
                 <td style="text-align:center">{{row.f_comments}}</td>
                 <td style="text-align: center">
                   <img :src="imgdelete" alt="图片加载失败" class="img-rounded"
@@ -415,7 +419,8 @@ export default {
         devicetypes: this.$appdata.getParam('设备类型'),
         pipetypes:[],
         pipeways: this.$appdata.getParam('连接方式'),
-        devicebrands:[]
+        devicebrands:[],
+        f_devices_num: 1
       })
     },
     closeModal () {

package/src/filiale/shanxian/sale.js

@@ -57,5 +57,8 @@ export default function () {
   Vue.component('user-paper-info-test', (resolve) => { require(['./components/UserFiles/UserPaperInfoTest'], resolve) })
   Vue.component('new-meter-list', (resolve) => { require(['./components/webMeter/meterinfo/NewMeterList'], resolve) })
   Vue.component('sale-web-meter-batch-operation-valve', (resolve) => { require(['./components/webMeter/WebMeterBatchOperationValve'], resolve) })
-
+// 交费记录维护列表
+  Vue.component('charge-list-maintain', (resolve) => { require(['./StockListmain'], resolve) })
+  // 所有气价信息列表
+  Vue.component('gas-price-list', (resolve) => { require(['./GasPriceList'], resolve) })
 }

package/src/filiale/yuansheng/CardMeterCenter.vue

@@ -132,7 +132,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 4]" disabled>
+                     v-scale="[model.f_collection, 4]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/xiangyun/sale'
+import wenxi from './filiale/yuansheng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/FileManageService.js

@@ -260,6 +260,7 @@ let FileManageService = {
         userfilesdevice.f_pipeexpire_date = userfilesdevice.f_pipeexpire_date ? userfilesdevice.f_pipeexpire_date : null
         userfilesdevice.f_userinfodevices_state = userfilesdevice.f_userinfodevices_state ? userfilesdevice.f_userinfodevices_state : null
         userfilesdevice.f_comments = userfilesdevice.f_comments ? userfilesdevice.f_comments : null
+        userfilesdevice.f_install_position = userfilesdevice.f_install_position ? userfilesdevice.f_install_position : null
         userfilesdevice.img = userfilesdevice.img ? userfilesdevice.img : {content: null, filename: null}
         userfilesdevice.img.content = userfilesdevice.img.content ? userfilesdevice.img.content : null
         userfilesdevice.img.filename = userfilesdevice.img.filename ? userfilesdevice.img.filename : null