sale-client 3.4.126 → 3.4.129

package/build/dev-server.js

@@ -1,157 +1,157 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://183.67.41.139:8400/',bendi1 = 'http://183.67.41.139:8400/'
-// 公司测试服务
-var fuwu = 'http://183.67.41.139:8400/'
-//铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-//铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-//韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  // '/rs/report': {
-  //   target: 'http://127.0.0.1:8079'
-  // },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://127.0.0.1:8078'
-    target:fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://127.0.0.1:8080/',bendi1 = 'http://119.146.1.106:8300/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4:8400/'
+//铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+//铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+//韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://127.0.0.1:8079'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://127.0.0.1:8078'
+    // target:fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -286,7 +286,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" v-ref:grid partial='list'>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
               <template partial='head'>
                 <tr>
                   <th>
@@ -658,6 +658,9 @@ let loadParamGem = async function (self) {
       search () {
         this.$refs.paged.$refs.criteria.search()
       },
+      // selectdata () {
+      //
+      // },
       modifyUser (row) {
         this.isOper = true
         this.createFile = true

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -207,7 +207,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" v-ref:grid partial='list'>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
               <template partial='head'>
                 <tr>
                   <th>

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

@@ -362,7 +362,6 @@
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
       let res = await self.$CardService.sellgas(self.model, self.row)
-      console.log('----------------->卡表收费返回id', res)
       let localeSustainMoney = window.localStorage.getItem('sustainMoney')
       if (localeSustainMoney != null) {
         localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
@@ -471,7 +470,7 @@
     }
     let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
       resolveMsg: null,
-      rejectMsg: '获取限购值失败！！'
+      rejectMsg: '获取最近卡表收费记录失败！！'
     })
     if(getNoWriteCard.data.length >0){
       self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {

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

@@ -190,9 +190,11 @@
     self.model.f_preamount = calFee - (dymoney - 0)
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
-      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    if(self.config.floor){
       self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-      self.model.f_collection =self.model.f_totalcost
+    }
     self.calText(getGas.data.chargeprice)
   }
 
@@ -210,7 +212,9 @@
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+      if(self.config.floor){
+        self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+      }
       self.model.f_collection = self.model.f_totalcost
       self.calText(getAmount.data.chargeprice)
     }
@@ -306,6 +310,7 @@
           notShowFormula: false, // 不显示计算公式,默认显示
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
+          floor: false,  //是否取整收费
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '现金缴费'
@@ -367,7 +372,6 @@
             this.$refs.paymentcode.paymentCodeShow = false
             console.log('付款码操作返回', ss)
             if (!ss.result) return
-
             this.clickConfirm = true
             this.model.f_curbalance = this.curbalance
             this.$dispatch('no-button')

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

@@ -309,20 +309,16 @@
     self.model.f_meter_type = self.row.f_meter_type
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
-      console.log('划价返回', getAmount, self.openFee, self.row.f_balance)
       self.model.f_preamount = getAmount.data.chargenum
       // 计算气费和其他费用(暂时只有开卡费，之后有其他费在加)
       let total = (getAmount.data.chargenum - 0) + (self.openFee - 0)
       self.model.f_totalcost = (self.row.f_balance - 0) > (total - 0) ? 0 : ((total - 0) - (self.row.f_balance - 0)).toFixed(4)
-      console.log('划价返回0', self.model.f_totalcost)
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if(self.config.floor){
         self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
       }
       self.model.f_collection = self.model.f_totalcost
-      console.log('划价返回1', self.model.f_totalcost)
-      console.log('划价返回2', self.model.f_collection)
       self.calText(getAmount.data.chargeprice)
     }
   }

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

@@ -431,6 +431,9 @@ and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
         } else {
           args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
         }
+        if (this.authArr.includes('操作记录查询限定')) {
+          args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
+        }
         this.model.search(args.condition, args.model)
       }
     },

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -150,7 +150,13 @@ export default {
 
           }
         })
-      } else {
+      } else if (this.row.f_meter_type.includes('卡表')) {
+        let totalGas = (this.row.f_total_gas - 0) + (this.row.f_initial_base - 0)
+        if (this.model.f_using_base_old > totalGas) {
+          this.$showAlert('该表可能存在超用，请核实输入后进行拆表操作！！', 'warning', 5000)
+          this.$dispatch('button-specifies', {name: '超用收费', value: 'over-use-charge'}, this.row)
+          return
+        }
         this.saveobj()
       }
     },

package/src/components/revenue/comprehen/Maintenance/bill/billOperationRecord.vue

@@ -5,7 +5,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterOperateList.vue

@@ -5,7 +5,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

package/src/components/revenue/comprehen/Maintenance/fillgas/fillgasOperationRecord.vue

@@ -5,7 +5,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

package/src/components/revenue/comprehen/Maintenance/hand/handOperateList.vue

@@ -5,7 +5,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

package/src/components/revenue/comprehen/Maintenance/otherRecords/OperationRecord.vue

@@ -3,7 +3,7 @@
     <validator name='v'>
       <form novalidate class="form-horizontal">
         <p class="bg-info text-center" style="padding: 8px;font-size: 20px">操作记录</p>
-        <table style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center ">序号</th>
             <th style="text-align: center ">修改内容</th>

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

@@ -5,7 +5,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy" style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

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

@@ -154,6 +154,10 @@
             <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">
@@ -219,7 +223,8 @@
           'f_comments': '备注信息',
           'f_bill_date': '开票时间',
           'f_bill_operator': '开票人',
-          'f_serial_id': '流水号'
+          'f_serial_id': '流水号',
+          'f_serial_number' : '业务单号'
         },
         editstate:true,
       }

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -19,11 +19,6 @@
                      v-el:qjmc v-model="model.f_price_name" v-next-el="cx"
               >
             </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 type="number" class="input_search"  style="width: 60%" v-model="model.f_user_name" placeholder='气价编号'
-                     condition="f_price_id = '{}'" >
-            </div>
             <!--<div class="col-sm-4">-->
               <!--<label class="font_normal_body">生效时间大于</label>-->
               <!--<datepicker :format="'yyyy-MM-dd'"-->
@@ -45,6 +40,11 @@
             </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"

package/src/components/revenue/comprehen/replacement/replacementOperationRecord.vue

@@ -6,7 +6,7 @@
         <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 style="width: 600px">
+        <table class="list_area table_sy"  style="width: 600px">
           <tr>
             <th style="text-align: center">序号</th>
             <th style="text-align: center">修改内容</th>

package/src/filiale/qianneng/FilesManage/FileUserFiles.vue

@@ -286,7 +286,7 @@
                 </div>
               </div>
             </criteria>
-            <data-grid :model="model" class="list_area table_sy" v-ref:grid partial='list'>
+            <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
               <template partial='head'>
                 <tr>
                   <th>

package/src/filiale/qianneng/GasPriceList.vue

@@ -19,11 +19,6 @@
                      v-el:qjmc v-model="model.f_price_name" v-next-el="cx"
               >
             </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 type="number" class="input_search"  style="width: 60%" v-model="model.f_user_name" placeholder='气价编号'
-                     condition="f_price_id = '{}'" >
-            </div>
             <!--<div class="col-sm-4">-->
               <!--<label class="font_normal_body">生效时间大于</label>-->
               <!--<datepicker :format="'yyyy-MM-dd'"-->
@@ -45,6 +40,11 @@
             </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"

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -8,23 +8,23 @@
           <!--          </div>-->
           <div style="margin-top:10px;" v-for="row in model.otherdetail">
             <div class="row">
-              <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
-                <input class="input_search" style="width:60%" type="text" v-model="row.f_brand_spec" v-show="false"
-                       v-validate:f_brand_spec='{required: true }'>
-                <label for="f_brand_spec" class="font_normal_body " title="参数名称：其他收费收费类型">*收费类型</label>
+              <div class="col-sm-4" :class="[$v.payment.required ? 'has-error' : '']">
+                <input type="text" v-show="false" v-model="$refs.brand.selectedItems"
+                       v-validate:brand='{required: true }'>
+                <label for="f_brand_spec" class="font_normal_body " title="参数名称：其他收费收费类型">收费类型</label>
                 <v-select id="f_brand_spec"
                           placeholder='材料'
                           v-model="row.f_brand_spec"
                           :value.sync="row.f_brand_spec"
                           :options='brandspec'
                           @change="setTypename"
-                          close-on-select clear-button>
+                          close-on-select clear-button v-ref:brand>
                 </v-select>
               </div>
-              <div class="col-sm-4" :class="{'has-success':row.f_typename,'has-error':!row.f_typename}">
-                <input class="input_search" style="width:60%" type="text" v-model="row.f_typename" v-show="false"
-                       v-validate:f_typename='{required: true }'>
-                <label for="f_typename" class=" font_normal_body">&nbsp;*品名规格</label>
+              <div class="col-sm-4" :class="[$v.typename.required ? 'has-error' : '']">
+                <input type="text" v-show="false" v-model="$refs.typename.selectedItems"
+                       v-validate:typename='{required: true }'>
+                <label for="f_typename" class=" font_normal_body">&nbsp;品名规格</label>
                 <v-select
                   style="width: 100px"
                   v-model="row.f_typename"
@@ -32,7 +32,7 @@
                   :value.sync="row.f_typename"
                   :options='gettypename'
                   @change="setTypenumber"
-                  close-on-select clear-button>
+                  close-on-select clear-button v-ref:typename>
                 </v-select>
               </div>
               <div class="col-sm-4" :class="{'has-success':row.f_typenumber,'has-error':!row.f_typenumber}">
@@ -315,7 +315,6 @@
     self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
     self.model.otherdetail[0].f_brand_spec = [self.config.brandspec]
-
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage

package/src/filiale/rongchuang/CardMeterCenter.vue

@@ -496,7 +496,6 @@
         clickConfirm: false, // 控制确认按钮只能点击一次
         // 下拉框值
         paytype: [],
-        printstyle: this.$appdata.getParam('打印格式'),
         privilegeList: [{label: '无优惠', value: '0'}],
         BankTransfer: false,
         // 小数是否支持,导致划价产生的多余气量,金额
@@ -815,6 +814,9 @@
       }
     },
     computed: {
+      printstyle () {
+        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },

package/src/filiale/rongchuang/IOTMeterCenter.vue

@@ -458,7 +458,6 @@
         clickConfirm: false, // 控制确认按钮只能点击一次
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
-        printstyle: this.$appdata.getParam('打印格式'),
         privilegeList: [{label: '无优惠', value: '0'}],
         showfiles: false,
         serialShow: false,
@@ -741,6 +740,9 @@
       }
     },
     computed: {
+      printstyle () {
+        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },

package/src/filiale/rongchuang/NoCardMeterCenter.vue

@@ -328,7 +328,6 @@
         clickConfirm: false, // 控制确认按钮只能点击一次
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
-        printstyle: this.$appdata.getParam('打印格式'),
         mjshow: false
       }
     },
@@ -444,6 +443,9 @@
       }
     },
     computed: {
+      printstyle () {
+        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+      },
       'curbalance' () {
         if (this.model.f_preamount) {
           if (this.row.f_collection_type === '按金额') {

package/src/filiale/rongchuang/OtherChargeNew.vue

@@ -234,8 +234,8 @@
           // TODO
           self.$dispatch('success')
         } else if (self.model.f_print[0] === '电子发票') {
-          self.eticket_show=true
-          await self.$refs.asynceticket.openEticket(resid.data, self.row,'其他收费')
+          self.eticket_show = true
+          await self.$refs.asynceticket.openEticket(resid.data, self.row, '其他收费')
         }
       } else {
         self.$dispatch('success')
@@ -249,13 +249,13 @@
   let asyncOtherCharge = async function (self) {
     await self.$getConfig(self, 'OtherCharge')
     // 默认打印格式
-    if(self.row.f_paper_type){
-      self.model.f_print=self.row.f_paper_type instanceof Array  ? self.row.f_paper_type : [self.row.f_paper_type ]
-      console.log(" this.model.f_print", this.model.f_print)
-    }else{
-      self.model.f_print = self.config.printType instanceof Array  ? self.config.printType : [self.config.printType]
+    if (self.row.f_paper_type) {
+      self.model.f_print = self.row.f_paper_type instanceof Array ? self.row.f_paper_type : [self.row.f_paper_type ]
+      console.log(' this.model.f_print', this.model.f_print)
+    } else {
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     }
-    //self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    // self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
     self.model.f_brand_spec = [self.config.brandspec]
 
@@ -267,8 +267,8 @@
     title: '其他收费',
     data () {
       return {
-        //发票相关
-        eticket_msg:false,
+        // 发票相关
+        eticket_msg: false,
         eticket_show: false,
         config: {
           modificationList: true,
@@ -309,7 +309,6 @@
         typeNameList: [],
         typenumberList: [],
         brandspec: this.$appdata.getParam('品名及规格'),
-        printstyle: this.$appdata.getParam('打印格式'),
         paytype: this.$appdata.getParam('付款方式'),
         feetype: this.$appdata.getParam('其他费用'),
         services: this.$appdata.getParam('服务人员')
@@ -369,7 +368,7 @@
         this.typenumberList = this.$appdata.getParam(val)
       },
       async confirm (parameter) {
-        this.eticket_msg=false
+        this.eticket_msg = false
         // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
         this.$refs.paymentcode.paymentCodeShow = false
@@ -423,6 +422,9 @@
       }
     },
     computed: {
+      printstyle () {
+        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+      },
       feetime () {
         return [{label: '一个月', value: '1'}, {label: '三个月', value: '3'}, {label: '六个月', value: '6'}, {
           label: '一年',

package/src/filiale/rongchuang/ShowCardSellGas.vue

@@ -431,7 +431,6 @@
         openFee: 0, // 是否有开卡费
         paymentModel: [], // 多笔付款方式
         paytype: [],
-        printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
         privilegeList: [{label: '无优惠', value: '0'}],
         mjshow: false,
         // 小数是否支持,导致划价产生的多余气量,金额
@@ -766,6 +765,9 @@
       }
     },
     computed: {
+      printstyle () {
+        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },

package/src/filiale/rongchuang/bill/CustQueryEticket.vue

@@ -160,6 +160,10 @@
     },
     methods: {
       async open_eTicket () {
+        if (this.$login.f.orgid != '33520') {
+          this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
+          return
+        }
         if(this.selecteds.length>1){
           this.$showAlert('选中条数大于一条，请重新修改！！', 'warning', 2000)
           return

package/src/filiale/rongchuang/bill/EticketOpenCard.vue

@@ -154,6 +154,10 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
+      if (this.$login.f.orgid != '33520') {
+        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
+        return
+      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return
@@ -165,7 +169,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -189,7 +193,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.asynceticket.openETicket(this.selecteds.map(item => item.id).toString(), this.row,  '卡表结算')
+      this.$refs.asynceticket.openETicket(this.selecteds.map(item => item.id).toString(), this.row, '卡表结算')
     },
     getorg (val) {
       this.f_orgid = this.$login.convertToIn(val)

package/src/filiale/rongchuang/bill/EticketOpenJBPage.vue

@@ -150,6 +150,10 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
+      if (this.$login.f.orgid != '33520') {
+        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
+        return
+      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return

package/src/filiale/rongchuang/bill/EticketOpenPage.vue

@@ -145,6 +145,10 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
+      if (this.$login.f.orgid != '33520') {
+        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
+        return
+      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return

package/src/sale.js

@@ -719,14 +719,17 @@ export default function (filiale) {
   Vue.component('regional-add', (resolve) => { require(['./components/revenue/regionalgas/regionaladd.vue'], resolve) })
   Vue.component('regional-list-record', (resolve) => { require(['./components/revenue/regionalgas/regionalListRecord'], resolve) })
   Vue.component('regional-show', (resolve) => { require(['./components/revenue/regionalgas/regionalshow'], resolve) })
-  // 档案信息
-  Vue.component('file-user-files', (resolve) => { require(['./components/FilesManage/FileUserFiles'], resolve) })
+
+
   // 团缴管理
   Vue.component('nc-archives-manage', (resolve) => { require(['./components/archives/archivesmanage'], resolve) })
   // 管理列表
   Vue.component('archives-list', (resolve) => { require(['./components/archives/ArchivesList'], resolve) })
   Vue.component('archives-add', (resolve) => { require(['./components/archives/ArchivesAdd'], resolve) })
   Vue.component('userfiles-list', (resolve) => { require(['./components/archives/UserfilesList'], resolve) })
+
+  // 档案信息
+  Vue.component('file-user-files', (resolve) => { require(['./components/FilesManage/FileUserFiles'], resolve) })
   // 用户综合信息
   Vue.component('file-user-general-info', (resolve) => { require(['./components/FilesManage/UserGeneralInfoTest'], resolve) })
   // 单个表具信息test