sale-client 3.6.411 → 3.6.413

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Jul 08 09:48:59 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://192.168.50.67:30785/', 'http://192.168.50.67:30785']
 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.6.411",
+  "version": "3.6.413",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -227,7 +227,7 @@ export default {
       cancelreason: '',
       cancelid: '',
       f_userfiles_id: '',
-      model: new PagedList('rs/sql/insturctDetailQuery', 30),
+      model: new PagedList('rs/sql/insturctDetailQuery', 30, {f_userfiles_id: this.row.f_userfiles_id}),
       row: null,
       searchshow: false,
       show: false,

package/src/components/revenue/base/rightview/CardList.vue

@@ -434,7 +434,7 @@
           } else {
             name = 'rs/report/machine_bill'
           }
-        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户' || type === '物联网赠气') {
+        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_iot_bill'
           } else {
@@ -458,7 +458,7 @@
               name = 'rs/report/sendCard_bill'
             }
           }
-        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
+        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_card_bill'
           } else {
@@ -498,7 +498,7 @@
           name = 'rs/report/iotGiftGas'
         } else if (type === '卡表赠费') {
           name = 'rs/report/icGiftFee'
-        } else if (type === '卡表赠费') {
+        } else if (type === '卡表赠气') {
           name = 'rs/report/icGiftGas'
         }
         return name

package/src/filiale/bayan/FileUserFiles.vue

@@ -0,0 +1,849 @@
+<template>
+  <div id="file-user-files" class="binary">
+    <div :class="{'basic-main': !createFile,'binary-left': createFile}" >
+      <div class="flex" style="flex: 1;">
+        <div style="flex: 1.2">
+          <criteria-paged :model="model" v-ref:paged  @sort="sort">
+            <criteria @condition-changed="$parent.selfSearch" partial='criteria' v-ref:criteria>
+              <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+                <div class="row">
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" v-if="!$parent.$parent.createFile">
+                    <label class="font_normal_body">组织机构</label>
+                    <res-select
+                      :initresid='$parent.$parent.curorgid'
+                      @res-select="$parent.$parent.getorg"
+                      is-mul="false"
+                      restype='organization'
+                    >
+                    </res-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group"
+                    v-if="$parent.$parent.clientWidth>1600">
+                    <label class="font_normal_body">客户编号</label>
+                    <input class="input_search" condition="f_userinfo_code = '{}'"
+                           placeholder='客户编号'
+                           style="width:60%" type="text" v-model="model.f_userinfo_code">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" v-if="!$parent.$parent.createFile">
+                    <label class="font_normal_body">客户名称</label>
+                    <input class="input_search" condition="f_user_name like '%{}%'"
+                           placeholder='客户姓名'
+                           style="width:60%" type="text" v-model="model.f_user_name">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group button-range">
+                    <!--<button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.showFileInfo()">查看批量状态-->
+                    <!--</button>-->
+                    <button @click="search(), $parent.$parent.clean()" class="button_search button_spacing"
+                            style="float: right">查询
+                    </button>
+                    <button @click="$parent.$parent.clear()" class="button_clear button_spacing"
+                            style="float: right">清空
+                    </button>
+                    <button @click="$parent.$parent.createnewfile()" class="button_search button_spacing"
+                            style="float: right">单户建档
+                    </button>
+                    <button class="button_search button_spacing" @click="$parent.$parent.createInfoForFile()">批量建档
+                    </button>
+                    <button  class="button_search button_spacing" @click="$parent.$parent.downloadFiles()">模板下载
+                    </button>
+                    <button @click="$parent.$parent.importFile" class="button_export button_spacing"
+                            style="float: right" v-if="false">导入
+                    </button>
+                    <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
+                    <button @click="$parent.$parent.bulkOperations('批量销户', 'batch-cancellation')"
+                            class="button_delete button_spacing"
+                            style="float: right"
+                            v-if="$parent.$parent.rows && $parent.$parent.rows.length === 1 && $parent.$parent.rows[0].f_user_state !== '正常'">
+                      销户
+                    </button>
+                    <button @click="$parent.$parent.bulkOperations('批量启用', 'batch-enable')"
+                            class="button_search button_spacing"
+                            style="float: right"
+                            v-if="$parent.$parent.rows && $parent.$parent.rows.length === 1 && $parent.$parent.rows[0].f_user_state === '销户'">
+                      启用
+                    </button>
+                    <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.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" v-if="$parent.$parent.createFile">
+                    <label class="font_normal_body">组织机构</label>
+                    <res-select
+                      :initresid='$parent.$parent.curorgid'
+                      @res-select="$parent.$parent.getorg"
+                      is-mul="false"
+                      restype='organization'
+                    >
+                    </res-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group"
+                    v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile">
+                    <label class="font_normal_body">客户编号</label>
+                    <input class="input_search" condition="f_userinfo_code = '{}'"
+                           placeholder='客户编号'
+                           style="width:60%" type="text" v-model="model.f_userinfo_code">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" v-if="$parent.$parent.createFile">
+                    <label class="font_normal_body">客户名称</label>
+                    <input class="input_search" condition="f_user_name like '%{}%'"
+                           placeholder='客户姓名'
+                           style="width:60%" type="text" v-model="model.f_user_name">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">旧客户号</label>
+                    <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='客户编号'
+                           style="width:60%"
+                           type="text"
+                           v-model="model.f_olduserinfo_code">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
+                              close-on-select condition="f_gasproperties='{}'"
+                              placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">客户电话</label>
+                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
+                           type="text"
+                           v-model="model.f_user_phone">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">客户地址</label>
+                    <input class="input_search" condition="f_address like '%{}%'" placeholder='客户地址' style="width:60%"
+                           type="text" v-model="model.f_address">
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">客户状态</label>
+                    <v-select :options='$parent.$parent.userstates' :value.sync="model.f_user_state"
+                              close-on-select condition="f_user_state='{}'"
+                              :value-single="true"
+                              placeholder='客户状态' v-model="model.f_user_state"></v-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">调&ensp;压&ensp;箱</label>
+                    <v-select :options='$parent.$parent.adjustables' :search='true'
+                              :value.sync="model.f_adjustable_id"
+                              close-on-select
+                              condition="f_adjustable_id = '{}'" placeholder='调压箱'
+                              v-model='model.f_adjustable_id'></v-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    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'" condition="f_createfile_date >= '{}'">
+                    </datepicker>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
+                    <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                                :format="'yyyy-MM-dd'" condition="f_createfile_date <= '{}'">
+                    </datepicker>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">打印时间</label>
+                    <datepicker placeholder="开始日期" v-model="model.startPrintDate" :value.sync="model.startPrintDate" style="width:60%"
+                                :format="'yyyy-MM-dd'" condition="f_printdate >= '{}'">
+                    </datepicker>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">打印时间</label>
+                    <datepicker placeholder="结束日期" v-model="model.endPrintDate" :value.sync="model.endPrintDate" style="width:60%"
+                                :format="'yyyy-MM-dd'" condition="f_printdate <= '{}'">
+                    </datepicker>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">工业备注</label>
+                    <v-select :options='$parent.$parent.industrycomments' :value.sync="model.f_industry_comments"
+                              close-on-select condition="f_industry_comments='{}'"
+                              placeholder='气表类型' v-model="model.f_industry_comments"></v-select>
+                  </div>
+                  <!--<div-->
+                    <!--:class="{'col-sm-3':$parent.$parent.clientWidth>1600||!$parent.$parent.createFile,'col-sm-4':$parent.$parent.clientWidth<1600&&$parent.$parent.createFile}"-->
+                    <!--class="form-group">-->
+                    <!--<label class="font_normal_body">天然气使用证</label>-->
+                    <!--<v-select :options='$parent.$parent.usegas' :value.sync="model.f_send_usegas_card"-->
+                              <!--close-on-select condition="f_send_usegas_card='{}'"-->
+                              <!--placeholder='天然气使用证' v-model="model.f_send_usegas_card"></v-select>-->
+                  <!--</div>-->
+                </div>
+              </div>
+            </criteria>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
+              <template partial='head'>
+                <tr>
+                  <th>
+                    <nobr>序号</nobr>
+                  </th>
+                  <th>
+                    <nobr>客户编号</nobr>
+                  </th>
+                  <th>
+                    <nobr>客户名称</nobr>
+                  </th>
+                  <th>
+                    <nobr>客户电话</nobr>
+                  </th>
+                  <th  v-if="!$parent.$parent.$parent.isOper">
+                    <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;">{{$index + 1}}</td>
+                <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+                <td style="text-align: center;">{{row.f_user_name}}</td>
+                <td style="text-align: center;">{{row.f_user_phone}}</td>
+                <td style="text-align: center;" v-if="!$parent.$parent.$parent.isOper">{{row.f_address_detail ? row.f_address + row.f_address_detail :
+                  row.f_address}}
+                </td>
+                <td style="text-align: center;">{{row.f_user_state}}</td>
+                <td style="text-align: center;">{{row.f_createfile_date}}</td>
+                <td style="text-align: center;">{{row.f_printdate}}</td>
+                <td style="text-align: center;">
+                  <div>{{row.print_stats}}</div>
+                </td>
+                <td style="text-align: center;">
+                  <button type="button" name="button" class="button_search-2 button_spacing width-60"
+                          v-if="row.f_user_state === '正常' || row.f_user_state==='预备'"
+                          @click.stop="$parent.$parent.$parent.modifyUser(row)">修正
+                  </button>
+                </td>
+              </template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+        <div v-if="batcan || batenable">
+          <batch-cancellation v-if="batcan" :useraccount="model.rows" @clean="batchClean"
+                              @success="batchSuccess"></batch-cancellation>
+          <batch-enable v-if="batenable" :useraccount="model.rows" @clean="batchClean"
+                        @success="batchSuccess"></batch-enable>
+        </div>
+      </div>
+    </div>
+    <div class="binary-right" :style="{width:'70%'}" v-if="createFile">
+      <div class="auto" style="height: 100%; margin-top: 1%" >
+        <file-user-general-info-new  :f_filialeid="f_filialeid" :row="row" :areainfo="areainfo"
+                           :haslimit="config.hasLimit" @success="renew" @clean="clean"
+                           :isedit="isedit" :configs="configs"
+                           @build-success="buildFileSuccess" v-ref:info></file-user-general-info-new>
+      </div>
+    </div>
+
+    <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                     action="rs/file/uploadFile" tagname="导入档案" v-ref:file :headers="headers"></file-upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>
+
+    <modal :show.sync="progressShow" v-ref:modal   width="50%" style="width:auto;" backdrop="false" >
+      <header slot="modal-header" class="modal-header">
+        批量建档
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="progress" style="margin: 20px" >
+          <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent+'%'}">
+            {{percent}}%
+          </div>
+        </div>
+        <div style="width:100%;display: flex">
+          <p style="text-align: center;width: 100%;" v-show="!downbutton">文件正在导入..</p>
+          <p style="text-align: center;width: 100%;" v-show="downbutton">导入成功:{{inputsuccessmage}}</p>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='closeRequeset'>关闭</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+    import {PagedList, HttpResetClass} from 'vue-client'
+    import Vue from 'vue'
+    import co from 'co'
+    import axios from 'axios'
+
+let loadParamGem = async function (self) {
+      await self.$getConfig(self, 'UserFiles')
+      self.headers.username = Vue.$login.f.name
+      self.headers.username = Vue.$login.guid()
+      await self.$LoadParams.loadParam(self.f_filialeid)
+      // await self.$LoadParams.loadMeterBook(self.f_filialeid)
+      await self.search()
+      self.initAdjustables()
+    }
+
+    let addressInfoGen = async function (self, areainfo) {
+      areainfo.isEdit = false
+      if (areainfo.file_num > 0 && !areainfo.f_userinfo_id) {
+            // 完善
+            // 将表档案信息带入，完善客户信息
+        let getMetersInfo = await self.$resetpost('rs/logic/sale_getMeterByAddress', {
+          data: {
+            f_useraddress_id: areainfo.id
+          }
+        }, {resolveMsg: null, rejectMsg: '获取表信息出错'})
+        areainfo.meter = getMetersInfo.data[0]
+      }
+      if (areainfo.file_num > 0 && areainfo.f_userinfo_id) {
+            // 添加 将客户信息带入
+        let getUserinfo = await self.$resetpost('rs/sql/saleSingleTable', {
+          data: {
+            tablename: 't_userinfo',
+            condition: `f_userinfo_id = '${areainfo.f_userinfo_id}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取档案出错'})
+
+        areainfo.user = getUserinfo.data[0]
+      }
+      self.bulidFiles(areainfo)
+    }
+
+    export default {
+      'title': '预备户管理',
+      data () {
+        return {
+          config: {
+            createType: ['address', 'area'],  // 建档方式： address-地址建档  area-小区建档
+            hasLimit: true
+          },
+          model: new PagedList('rs/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
+          row: null, // 选择一条客户信息，对其进行修改
+          areainfo: null, // 小区批量建档使用的数据
+          rows: [], // 客户档案选择一条时，将只显示一条信息，rows用来存放整页的数据
+          headers: {'username': this.$login.f.name, 'blodid': this.$login.guid()},
+          contract: [{label: '全部', value: ' is null or f_contract_id is not null'}, {
+            label: '有',
+            value: ' is not null'
+          },
+                    {label: '无', value: ' is null'}],
+          industrycomments: this.$appdata.getParam('工业备注') ? [{
+            label: '全部',
+            value: ''
+          }, ...this.$appdata.getParam('工业备注')] : [],
+          orderDefault: 'f_createfile_date desc',
+          orderFields: {
+            f_userinfo_id: 'no'
+          },
+
+          downbutton:false,
+          percent:0,
+          timer:'',
+          uuida:'',
+          progressShow:false,
+          inputsuccessmage:'',
+
+          createFile: false,
+
+          curorgid: [this.$login.f.orgid],
+          f_filialeid: this.$login.f.orgid,
+
+                // 销户启用
+          batcan: false,
+          batenable: false,
+          version: '',
+
+          inputtores: this.$appdata.getParam('抄表员'),
+          adjustables: [],
+
+                // 导入组件
+          show: false,
+
+                // 点击建档或修正时控制列表展示， 防止拥挤
+          isOper: false,
+
+          criteriaShow: false,
+
+          gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
+          f_user_state: '预备',
+          showselectaddress: false,
+          isedit: false,
+          clientWidth: document.body.clientWidth,
+          batchMeterShow: false,
+          billData: {
+            url: 'rs/report/userignition',
+            bill: ''
+          },
+          configs: {
+            hasPrint: false,  // 默认打票
+            hasBillManage: false  // 默认不启用发票管理
+          },
+          printflag: false,
+          newdata: {}
+        }
+      },
+      ready () {
+        this.$refs.paged.$refs.criteria.model.f_user_state = this.f_user_state
+        loadParamGem(this)
+      },
+      compiled () {
+        window.onresize = () => {
+          return (() => {
+            this.clientWidth = document.body.clientWidth
+          })()
+        }
+  },
+      methods: {
+        progressclose(){
+          if(this.timer != null){
+            clearInterval(this.timer);
+          }
+          this.progressShow = false;
+          this.percent=0;
+        },
+        closeRequeset() {
+          // 判断进度是否已完成
+          if (this.percent === 100) {
+            // 已完成导入，直接关闭并清理
+            if (this.timer != null) {
+              clearInterval(this.timer);
+            }
+            this.progressclose();
+            this.percent = 0;
+            this.uuida = '';
+            this.downbutton = false;
+          } else {
+            // 进度未完成，弹出确认关闭的提示
+            this.$showMessage("确定关闭吗？当前正在导入，关闭后将无法获取导入进度！", ['confirm', 'cancel']).then(res => {
+              if (res === 'confirm') {
+                if (this.timer != null) {
+                  clearInterval(this.timer);
+                }
+                this.progressclose();
+                this.percent = 0;
+                this.uuida = '';
+                this.downbutton = false;
+              }
+            });
+          }
+        },
+        async getRequestReturn(){
+
+          let self = this;
+          let param = {
+            uuid:this.uuida
+          };
+          console.log(param)
+          console.log("=============")
+          this.timer = setInterval(function(){
+            self.$resetpost('/rs/logic/getBatchOperaPro',{data:param},{resolveMsg: null, rejectMsg: null}, 0).then((res)=>{
+              if(res.data && res.data.speed  ){
+                if(res.data.speed==100 || res.data.speed>100 ){
+                  clearInterval(self.timer);
+                  self.percent = 99;
+                  setTimeout(function(){
+                    self.percent = 100
+                    self.inputsuccessmage = `本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successsum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`
+                    self.downbutton = true;
+                  },100);
+                }else{
+                  self.percent = res.data.speed
+                }
+              }
+            });
+          },2000);
+        },
+        downloadFiles(){
+          let downurl='rs/downloadfile/file?filename=预备户批量建档导入Excel模板';
+          this.$downFile(downurl,'预备户批量建档导入Excel模板.xlsx')
+        },
+        close () {
+          this.printflag = false
+          this.clean()
+        },
+        async downFiles (index, row) {
+          let param = {
+            f_userinfo_id: row.f_userinfo_id,
+            version: row.version,
+            f_print_lc: '是',
+            f_printdate: this.$login.toStandardTimeString()
+          }
+          await await this.$resetpost('rs/logic/updateprint', {param}, {resolveMsg: null, rejectMsg: ''})
+          console.log('xxxxxxxxxxxxxxxxxxxxx')
+              // 下载不同文件
+          if (index == 0) {
+            let url = 'rs/report/userinstall'
+            this.billData.url = url
+          } else {
+            let url = 'rs/report/userignition'
+            this.billData.url = url
+          }
+          this.newdata = row
+          this.printflag = true
+        },
+        showFileInfo () {
+
+        },
+        closemodal () {
+          this.batchMeterShow = false
+        },
+        createInfoForFile () {
+          this.batchMeterShow = true
+        },
+        hidden () {
+          this.criteriaShow = !this.criteriaShow
+        },
+        search () {
+          this.$refs.paged.$refs.criteria.model.f_user_state = this.f_user_state
+                // this.$refs.paged.$refs.criteria.search()
+        },
+        modifyUser (row) {
+          this.isOper = true
+          this.createFile = true
+          this.isedit = true
+          this.row = row
+          this.areainfo = null
+          this.row.version = row.version
+          console.log('row.version====>', this.row.version)
+        },
+        clean () {
+          this.createFile = false
+          this.row = null
+          this.isOper = false
+          this.areainfo = null
+              // this.$refs.paged.$refs.grid.select(null)
+          this.$refs.paged.$refs.grid.model.rows = this.rows
+          this.search()
+        },
+        createnewfile () {
+          this.isOper = true
+          this.createFile = true
+          this.isedit = false
+          this.row = null
+          this.areainfo = null
+          this.$refs.info.clearinfo()
+        },
+        renew () {
+          this.row = null
+          this.areainfo = null
+          this.isOper = false
+          this.$refs.info.clearinfo()
+          this.clearCondition()
+          this.search()
+              // 建档或修正档案成功刷新地址列表
+          this.$refs.addressfiles.$refs.paged.$refs.cri.search()
+        },
+        clearCondition () {
+          Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+            this.$refs.paged.$refs.criteria.model[key] = ''
+          })
+        },
+
+        bulkOperations (name, type) {
+          if (name === '批量销户') {
+            this.batcan = true
+            this.batenable = false
+            this.newArea = false
+          } else if (name === '批量启用') {
+            this.batenable = true
+            this.batcan = false
+            this.newArea = false
+          }
+        },
+        batchSuccess () {
+          this.clearCondition()
+          this.batchClean()
+        },
+        batchClean () {
+          this.batcan = false
+          this.batenable = false
+          this.newArea = false
+          this.search()
+        },
+        buildFile (row) {
+                // console.log('我是建档。。。', row)
+          this.row = row
+        },
+            // 小区批量建档
+        bulidFiles (row) {
+          this.row = null
+          this.areainfo = row
+                // 将列表的数据清空
+          this.$refs.paged.$refs.grid.model.rows = []
+        },
+            // 小区批量建档成功
+        buildFileSuccess (data) {
+                // console.log('建档案成功', data)
+          this.model.rows.unshift(data)
+        },
+        selfSearch (args) {
+          console.log('开始查询档案', this.f_filialeid)
+          if (!this.f_filialeid) {
+            this.f_filialeid = this.$login.f.orgid
+          }
+          args.condition = `${args.condition} and f_filialeid = '${this.f_filialeid}'`
+          this.criteriaShow = false
+          this.$refs.paged.$refs.grid.$el.scrollTop = 0
+          this.model.search(args.condition, args.model)
+          this.clean()
+        },
+        printok () {
+          console.log('======================')
+              // this.$dispatch('success')
+        },
+        sort (field, rule) {
+                // 将所有排序方式设为不排序，实现相互排斥
+          for (let key in this.orderFields) {
+            if (key === field) {
+              this.orderFields[key] = rule
+            } else {
+              this.orderFields[key] = 'no'
+            }
+          }
+                // 如果新规则不排序，还原为默认排序
+          if (rule === 'no') {
+            this.model.paramSource.orderitem = `'${this.orderDefault}'`
+          } else {
+            this.model.paramSource.orderitem = `'${field} ${rule}'`
+          }
+
+          this.search()
+        },
+
+        getLocation (row) {
+                // 可能会存在添加，完善，建档
+          console.log('进入', row)
+
+          addressInfoGen(this, row)
+        },
+        areaFiles (row) {
+          row.isEdit = true
+          row.f_residential_area_id = row.id
+                // row.id = null
+          delete row.id
+          this.bulidFiles(row)
+        },
+
+        initAdjustables () {
+          console.log('初始化调压箱', this.$GetSaleParam)
+          let arr = []
+          let filter = this.$login.f.orgid
+          this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
+            let temp = {}
+            temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
+            temp.value = `${item.value.id}`
+            arr.push(temp)
+          })
+          this.adjustables = [{label: '全部', value: ''}, ...arr]
+        },
+        importFile () {
+          this.show = true
+        },
+        clear () {
+          Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+            this.$refs.paged.$refs.criteria.model[key] = []
+          })
+          this.$refs.paged.$refs.criteria.model.f_user_state = this.f_user_state
+        },
+        getuuid(){
+          let uuidA = '';
+          var s = [];
+          var hexDigits = '0123456789abcdef';
+          for (var i = 0; i < 36; i++) {
+            s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+          }
+          s[14] = '4';
+          s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+          s[8] = s[13] = s[18] = s[23] = '-';
+          uuidA = s.join('');
+          this.uuida = uuidA;
+        },
+        getorg (val) {
+          this.f_filialeid = val[0]
+        }
+      },
+      computed: {
+        userstates () {
+          return [{label: '预备', value: '预备'}]
+        },
+        usegas () {
+          return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+        },
+        areas () {
+          let rs = []
+          for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
+            let temp = {
+              label: this.$login.f.f_allArea[i].label,
+              value: this.$login.f.f_allArea[i].label
+            }
+            rs.push(temp)
+          }
+          return [{label: '全部', value: ''}, ...rs]
+        },
+        firestates () {
+          return [
+                    {label: '全部', value: ''},
+                    {label: '点火', value: '1'},
+                    {label: '未点火', value: '0'}
+          ]
+        },
+        jurisdiction () {
+          return this.$login.r
+        }
+      },
+      watch: {
+            // 每次查询将查询到的数据存储起来，供选择操作后的替换
+        'model.state' (val) {
+          if (val === '正确') {
+            this.rows = this.model.rows
+          }
+        },
+        'f_filialeid' (val) {
+          loadParamGem(this)
+        }
+      },
+      events: {
+        FileUpload: function (file, res) {
+          let data = {
+            tablename: 't_userinfo',
+            filepath: res.path
+          }
+          this.$resetpost('rs/logic/import', data, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+            console.log('dddddddd', this)
+            this.close()
+            this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
+            this.search()
+          })
+        },
+        'onFileUpload': function (file, res) {
+          if (this.batchmoneyShow) {
+            let param = {
+              filepath: res.f_downloadpath,
+              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
+            }
+            let http = new HttpResetClass()
+            http.load('POST', 'rs/logic/SumSettleFileImport', {data: param}, {
+              resolveMsg: null,
+              rejectMsg: '上传失败'
+            })
+          }
+
+          if (this.batchMeterShow) {
+            // this.iswork = true
+            this.getuuid();
+            console.log(this.uuida)
+            console.log("uuida=========")
+            if(this.uuida == '') return;
+            // 当前上传的是批量导入的档案
+            let param = {
+              filepath: res.f_downloadpath,
+              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,
+              uuid: this.uuida
+            }
+            let self = this
+            try {
+              self.progressShow = true;
+              axios.post('rs/logic/newPrepareSettleFileImport',
+                {data: param}, {timeout: 1000}).then((res) => {
+              })
+              self.percent=0;
+              self.getRequestReturn();
+            } catch (error) {
+              if (error.response) {
+                if (error.response.status == 500) {
+                  this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
+                } else if (error.response.status == 404) {
+                  this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
+                } else {
+                  this.$showAlert(error.response.data, 'danger', 2000)
+                }
+              } else if (error.request) {
+                this.$showAlert(error.request, 'danger', 2000)
+              } else {
+                this.$showAlert(error.message, 'danger', 2000)
+              }
+              this.iswork = false
+            }
+            this.$refs.file.$el.querySelector('input').value = ''
+            this.batchMeterShow = false
+            this.search()
+          }
+        },
+        'confirmaddress' (res) {
+          console.log('选定地址', res)
+        }
+      }
+    }
+</script>
+<style>
+  .nav-tabss ul > li > a {
+    padding: 5px 10px;
+  }
+</style>

package/src/filiale/bayan/sale.js

@@ -45,4 +45,6 @@ export default function () {
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
   // 收费页面的流水查询
   Vue.component('meter-charge-record-query', (resolve) => { require(['./ChargeRecordQuery'], resolve) })
+// 档案管理新(预备户建档)
+  Vue.component('file-user-files-new', (resolve) => { require(['./FileUserFiles'], resolve) })
 }

package/src/filiale/yangchun/ChangeMeter.vue

@@ -363,8 +363,8 @@ let getPrice = async function (self) {
   let chargeData = {
     tablename: 't_chargeprice',
     items: 'f_gas,f_money,f_price',
-    condition: `f_userfiles_id = '${self.row.f_userfiles_id}'`,
-    orderitem: 'id desc'
+    condition: `f_userfiles_id = '${self.row.f_userfiles_id}' and f_state = '有效'`,
+    orderitem: 'f_operate_date desc'
   }
   let chargePrice = await http2.load('POST', 'rs/sql/singleTable_OrderBy', {
     data: chargeData

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

@@ -308,6 +308,16 @@
             <label for="f_process_id" class="font_normal_body">&ensp;{{getConfigLabelName('f_expiration_date','保险结束日期')}}</label>
             <input type="text" v-model="baseinfo.base.userfees.f_expiration_date" disabled class="input_search" style="width:60%">
           </div>
+          <div class="col-sm-4 form-group"
+               v-show="(formconfig && formconfig.f_gas_type && formconfig.f_gas_type.required) || !onlyshowmust">
+            <label for="f_gas_type" class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_type','抵扣单价')}}</label>
+            <input type="text" v-model="baseinfo.base.f_gas_type"  class="input_search" style="width:60%">
+          </div>
+          <div class="col-sm-4 form-group"
+               v-show="(formconfig && formconfig.f_project_money && formconfig.f_project_money.required) || !onlyshowmust">
+            <label for="f_project_money" class="font_normal_body">&ensp;{{getConfigLabelName('f_project_money','抵扣金额')}}</label>
+            <input type="text" v-model="baseinfo.base.f_project_money" disabled class="input_search" style="width:60%">
+          </div>
 
         </div>
         <div class="row">

package/src/main.js

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