sale-client 3.4.129 → 3.4.130-jb

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Dec 11 10:17:57 CST 2025
+gradle.version=5.2.1

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // 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://114.117.163.208:8600/#'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试
@@ -95,7 +95,7 @@ var proxyTable = {
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
-    target: 'http://127.0.0.1:8078'
+    target: fuwu
     // target:fuwu
   }
 }

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "sale-client",
-  "version": "3.4.129",
-  "description": "收费模块前台组件",
-  "main": "src/index.js",
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "page": "rimraf dist && mkdirp dist && ncp static dist/singlepage && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.singlepage.conf.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/product.git"
-  },
-  "dependencies": {
-    "examples": "^0.1.0",
-    "js-file-download": "0.4.12",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "yarn": "^1.22.10"
-  },
-  "devDependencies": {
-    "address-client": "3.0.24-70",
-    "axios": "0.15.3",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "compression-webpack-plugin": "1.1.2",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-html": "^3.0.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
-    "less": "^2.7.3",
-    "manage-client": "3.1.8-88",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "qrcodejs2": "0.0.2",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.0-2",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.49",
-    "vue-clipboard2": "0.3.1",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  },
-  "keywords": [
-    "selling-clients"
-  ],
-  "author": "张桥",
-  "license": "ISC",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "sale-client",
+  "version": "3.4.130-jb",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "page": "rimraf dist && mkdirp dist && ncp static dist/singlepage && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.singlepage.conf.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product.git"
+  },
+  "dependencies": {
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.0.24-70",
+    "axios": "0.15.3",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "compression-webpack-plugin": "1.1.2",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.60",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.68",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.93",
+    "vue-clipboard2": "0.3.1",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/App.vue

@@ -1,16 +1,61 @@
 <template>
-  <app-base class="bg">
+  <app-base class="bg" @click="isTimeOut">
     <div class='flex'>
       <article>
         <route :comp="{name: 'login'}"></route>
-        <!--<route :comp="{name: 'change-meter-add-gas'}"></route>-->
       </article>
     </div>
   </app-base>
 </template>
 
 <script>
-  export default {
+import Vue from 'vue'
 
+export default {
+  data () {
+    return {
+      lastTime: null, // 最后一次点击的时间
+      currentTime: null, // 当前点击的时间
+      // 获取一次不在获取控制
+      getConfig: false,
+      config: {
+        timeOut: 0, // 单位: 分钟
+        exitPrompt: '因您长时间未操作, 请重新登陆!'
+      },
+    }
+  },
+  ready () {
+    Vue.mmType = 'nginx'
+    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+  },
+  created () {
+    this.lastTime = new Date().getTime()
+  },
+  methods: {
+    async isTimeOut () {
+      // 获取config配置
+      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+        await this.$getConfig(this, 'App')
+        this.getConfig = true
+      }
+      // 无配置,不开启
+      if (this.config.timeOut <= 0) return
+      // 记录这次点击的时间
+      this.currentTime = new Date().getTime()
+      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+        // 如果是登录状态
+        if (this.$login.f.id) {
+          await this.$showMessage(this.config.exitPrompt)
+          window.location.reload()
+        } else {
+          this.lastTime = new Date().getTime()
+        }
+      } else {
+        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+        this.lastTime = new Date().getTime()
+      }
+    }
   }
+}
 </script>

package/src/components/FilesManage/FileUserFiles.vue

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -23,10 +23,6 @@
             <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号'
                    v-next-el="{id: 'meterbase'}">
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_metertitles" class="font_normal_body">表具状态</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_table_state" placeholder='表具状态' disabled>
-          </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
@@ -650,6 +646,31 @@
         this.field = field
       },
       async meternumberValidate () {
+        if (this.row.f_meternumber && this.row.gasbrand.length > 0) {
+          let param = {
+            f_meternumber: this.row.f_meternumber,
+            f_gasbrand_id: this.row.gasbrand[0].id
+          }
+          if (this.row.f_userfiles_id) {
+            param.f_userfiles_id = this.row.f_userfiles_id
+          }
+          let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
+            resolveMsg: null,
+            rejectMsg: '表号验证失败！！'
+          })
+          if (this.row.gasbrand[0].f_meter_type === '物联网表') {
+            if (res.data) {
+              this.row.f_meternumber = ''
+              this.$showAlert('表号已存在！！', 'warning', 3000)
+            }
+          } else {
+            if (res.data) {
+              this.$showAlert('请注意，相同的表号已存在', 'warning', 3000)
+            }
+          }
+        } else {
+          return
+        }
         let http1 = new HttpResetClass()
         let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}' and mi.f_filialeid= '${this.$login.f.orgid}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
         if (res1.data.length > 0) {
@@ -673,8 +694,6 @@
             }
           }
         }
-          // 验证表号
-        if (this.row.f_meternumber && this.row.gasbrand.length > 0) {
           // 表号位数验证
           let meternumberLen = this.row.gasbrand[0].f_meternumber_len
           if (meternumberLen) {
@@ -692,28 +711,6 @@
               return
             }
           }
-          let param = {
-            f_meternumber: this.row.f_meternumber,
-            f_gasbrand_id: this.row.gasbrand[0].id
-          }
-          if (this.row.f_userfiles_id) {
-            param.f_userfiles_id = this.row.f_userfiles_id
-          }
-          let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
-            resolveMsg: null,
-            rejectMsg: '表号验证失败！！'
-          })
-          if (this.row.gasbrand[0].f_meter_type === '物联网表') {
-            if (res.data) {
-              this.row.f_meternumber = ''
-              this.$showAlert('表号已存在！！', 'warning', 3000)
-            }
-          } else {
-            if (res.data) {
-              this.$showAlert('请注意，相同的表号已存在', 'warning', 3000)
-            }
-          }
-        }
       },
       openModal () {
         this.mapShow = true

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -67,7 +67,7 @@
                   <datepicker placeholder="安装日期" style="width: 60%"
                               v-model="row.f_input_date"
                               :value.sync="row.f_input_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>
@@ -144,7 +144,7 @@
                   <datepicker placeholder="连接管安装日期" style="width: 60%"
                               v-model="row.f_pipeinstall_date"
                               :value.sync="row.f_pipeinstall_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>
@@ -154,7 +154,7 @@
                   <datepicker placeholder="连接管到期日期" style="width: 60%"
                               v-model="row.f_pipeexpire_date"
                               :value.sync="row.f_pipeexpire_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>

package/src/components/FilesManageNew/FileUserFiles.vue

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

package/src/components/SellGasCharge/ChargeCancel/CardMeterChargeCancel.vue

@@ -101,7 +101,7 @@
           </div>
         </form>
         <div style="text-align:right;margin-right:50px;height: auto">
-          <button class="btn btn-success width-60" @click="cancel()" :disabled="isToday" v-if="jurisdiction.includes('购气撤销')">购气撤销</button>
+          <button class="btn btn-default width-60" @click="cancel()" :disabled="isToday" v-if="jurisdiction.includes('购气撤销')">购气撤销</button>
           <button class="button_clear" @click="clean()">取消</button>
         </div>
 

package/src/components/charge/ChargeList.vue

@@ -45,7 +45,7 @@
             <div class="form-group col-sm-3">
               <label class="font_normal_body">表&emsp;&emsp;号</label>
               <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
-                     condition="f_meternumber like '%{}%'">
+                     condition="u.f_meternumber like '%{}%'">
             </div>
 
             <!--<div class="form-group col-sm-4">-->
@@ -98,6 +98,11 @@
                         condition="i.f_user_level = '{}'"
                         close-on-select style="width: 60%"></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">卡&emsp;&emsp;号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
+                     condition="f_card_id like '%{}%'">
+            </div>
             <div class="form-group col-sm-3" >
               <label class="font_normal_body">组织机构</label>
               <res-select :initresid='$parent.$parent.curorgid'
@@ -107,11 +112,6 @@
                           style="width: 60%">
               </res-select>
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">卡&emsp;&emsp;号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
-                     condition="f_card_id like '%{}%'">
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">使用类型</label>
               <v-select v-model="model.f_usetype"
@@ -166,7 +166,7 @@
             <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</a></span>
           </td>
           <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }">{{row.f_user_id}}&nbsp;&nbsp;{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_meter_brand}}
-            &nbsp;&nbsp;{{row.f_meter_style}}&nbsp;&nbsp;{{row.f_price_type}}&nbsp;&nbsp;{{row.f_price_name}}&nbsp;&nbsp;{{row.f_table_state}}
+            &nbsp;&nbsp;{{row.f_meter_style}}&nbsp;&nbsp;{{row.f_price_type}}&nbsp;&nbsp;{{row.f_price_name}}
           </td>
           <td style="white-space: nowrap;text-align: center;" :class="{'bg-danger' : row.f_table_state === '停用' }">{{row.f_meter_type}}&nbsp;&nbsp;({{ row.f_whether_hairpin }})
           </td>

package/src/components/charge/ChargeManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="unit" class="flex-row three" v-show="listpage">
-    <div class="binary-left" style="overflow: scroll;width:15%" >
+    <div class="binary-left" style="overflow: scroll;width:20%" >
       <mulitinfo :warninginfo="warningInfo" style="height:auto" @deal-msg="dealMsg" :data="row" :card-data="cardInfo" v-ref:info></mulitinfo>
     </div>
     <div class="binary-right" style="width:68%;overflow-y: scroll" >

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

@@ -263,7 +263,7 @@
       <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
     </div>
   </div>
-  <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
+  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -362,6 +362,7 @@
       // 加入扫码盒付款码支付流水号
       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)
@@ -470,7 +471,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/ChangeMeterAddGas.vue

@@ -532,7 +532,7 @@
             if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
               return ((this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
             } else {
-              return ((this.model.f_totalcost - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+              return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
             }
           }
         } else {

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

@@ -179,6 +179,7 @@
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -241,14 +242,15 @@
     </footer>
   </modal>
   <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
-  <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="物联网表收费"></upload>
-<!--  <modal :show.sync="showfiles" width="80%"style="width:auto;"  v-ref:modal middle backdrop="false">-->
-<!--    <article slot="modal-body">-->
-<!--      <upload :blodid="row.f_userinfo_id" v-ref:upload  :fusetype="uploadText" isremark="true" style="width:auto" ></upload>-->
-<!--    </article>-->
-<!--    <footer slot="modal-footer" class="modal-footer">-->
-<!--    </footer>-->
-<!--  </modal>-->
+  <!--<upload v-if="config.showupload" isremark="true" fusetype="物联网表收费"></upload>-->
+  <modal :show.sync="showfiles" width="80%"style="width:auto;"  v-ref:modal middle backdrop="false">
+    <article slot="modal-body">
+      <upload :blodid="model.id" v-ref:upload  :fusetype="uploadText" isremark="true" style="width:auto" ></upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+  <!--文件上传按钮-->
 
 </template>
 <script>
@@ -300,10 +302,7 @@
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
-    if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    }
-    // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     self.model.f_collection = self.model.f_totalcost
     self.model.f_preamount = ((getGas.data.chargenum - 0) - (self.dymoney - 0))
     if (self.model.f_payment == '赠气') {
@@ -452,16 +451,15 @@
     }
   }
   export default {
-    title: '物联网收费',
+    title: '卡表收费',
     data () {
       return {
         resid: [],  // 存放新增的f_files表中id
         config: {
           notShowFormula: false, // 不显示计算公式,默认显示
           priceCalculation: false, // 划气量控制
-          showupload: true,  // 默认显示附件上传组件
+          showupload: true,  // 默认不显示附件上传组件
           hasPrint: false,  // 默认打票
-          floor: true,  //是否取整收费
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
@@ -621,6 +619,9 @@
         this.eticket_show = false
         this.$dispatch('success')
       },
+      uploadFiles () {
+        this.showfiles = !this.showfiles
+      },
       async confirm () {
         let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行物联网表缴费吗？`, ['confirm', 'cancel'])
         if (res != 'confirm') return