sale-client 3.5.170 → 3.5.172

package/build/dev-server.js

@@ -1,201 +1,201 @@
-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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
-// 公司测试服务
-// var fuwu = 'http://192.168.50.4:8450'
-// 梅河口
-// var fuwu = 'http://139.214.92.34:8301'
-// 单县
-// var fuwu = 'http://119.187.112.234:8400'
-// 中盛
-// var fuwu = 'http://39.99.85.14:8400'
-// 燎原
-var fuwu = 'http://121.40.52.133:9001'
-// 葛华
-// var fuwu = 'http://219.138.226.181:8401'
-// 乌海
-// var fuwu = 'http://203.57.101.233:8400'
-// 铜川
-//  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/stopBasicLivingNew':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getBatchOperaPro':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/sql/sale_getUser':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getOperBtns':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/file/uploadFile':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
-  //   target:'http://127.0.0.1:8080'
-  // },
-  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/sql/getDownPlan':{
-  //   target:'http:127.0.0.1:8080'
-  // },
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/getWarningMsg': {
-  //   target: 'http://localhost:8080/'
-  // },
-  '/rs/file': {
-    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://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
+// 公司测试服务
+// var fuwu = 'http://192.168.50.4:8450'
+// 梅河口
+// var fuwu = 'http://139.214.92.34:8301'
+// 单县
+// var fuwu = 'http://119.187.112.234:8400'
+// 中盛
+// var fuwu = 'http://39.99.85.14:8400'
+// 燎原
+var fuwu = 'http://121.36.106.17:8400'
+// 葛华
+// var fuwu = 'http://219.138.226.181:8401'
+// 乌海
+// var fuwu = 'http://203.57.101.233:8400'
+// 铜川
+//  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/stopBasicLivingNew':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getBatchOperaPro':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/sql/sale_getUser':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getOperBtns':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/file/uploadFile':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/sql/getDownPlan':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/logic/saleExport': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/saleGetExportProgress': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/getWarningMsg': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/rs/file': {
+    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://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://192.168.50.4:8450'
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    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.5.170",
+  "version": "3.5.172",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/ChargeManage.vue

@@ -35,7 +35,7 @@
 
   </div>
   <div v-if="!listpage">
-    <user-info-detail-manage-new :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    <user-info-detail-manage-new parentname="charge-manage" :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel" @cancel-re="cancelAndRefresh"></user-info-detail-manage-new>
   </div>
   <div v-if="showModal">
     <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>
@@ -145,6 +145,13 @@ export default {
       cancel (obj) {
         this.listpage = true
       },
+      cancelAndRefresh (obj) {
+        this.listpage = true
+        this.clean()
+        this.clearCondition()
+        this.$refs.list.searchNoData()
+        this.$refs.card.search()
+      },
       modalsuccess (obj) {
         this.showModal = false
         this.$refs.list.criteriaShow = false

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

@@ -94,25 +94,34 @@
                      v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
             </div>
 
-            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气'"
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气'"
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-3" v-if="row.f_collection_type === '按金额'">
+            <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
-            <div class="col-sm-1 form-group">
+            <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
+              <label for="f_collection" class=" font_normal_body"><font size="4px"
+                                                                        style="font-weight:bold">*收&emsp;款</font></label>
+              <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;"
+                     type="number" v-model="model.f_collection"
+                     v-el:fcollection
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
+                     v-scale="[model.f_collection, 4]" disabled>
+            </div>
+            <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
             </div>
           </div>

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -279,48 +279,52 @@
       cancelmain () {
         this.$emit('cancel-main')
       },
-      clearBarrier(){
+      clearBarrier () {
         // 地址
         // 127.0.0.1:8445
         // 参数
-        let datas =  {
-          moduleName:"XiMeiSystem", // 固定值
-          content:{
-            tradeCode:"3015",// 固定值
-            appid: "yysf", // 固定值
-            partner: "cqsemay_bcts", // 固定值
-            version:"v1", // 固定值
-            tasked:this.getuuid(), // 任务id
-            notifyUrl:"http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack", // 固定值
-            meterNo: this.row.f_meternumber,// 表号
-            signType:" MD5" //固定值
+        let datas = {
+          moduleName: 'XiMeiSystem', // 固定值
+          content: {
+            tradeCode: '3015', // 固定值
+            appid: 'yysf', // 固定值
+            partner: 'cqsemay_bcts', // 固定值
+            version: 'v1', // 固定值
+            tasked: this.getuuid(), // 任务id
+            notifyUrl: 'http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack', // 固定值
+            meterNo: this.row.f_meternumber, // 表号
+            signType: ' MD5' // 固定值
           },
-          title: "清除异常", // 固定值
-          type: "清除异常", // 固定值
-          inputtor:this.row.f_operator, // 操作人
-          userId:this.row.f_userfiles_id,   // 表档案ID
+          title: '清除异常', // 固定值
+          type: '清除异常', // 固定值
+          inputtor: this.row.f_operator, // 操作人
+          userId: this.row.f_userfiles_id,   // 表档案ID
           dataId: null // 操作记录ID
         }
-        this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+        this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas}, {resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
         })
       },
-      getuuid(){
-        let uuidA = '';
-        var s = [];
-        var hexDigits = '0123456789abcdef';
+      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[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('');
-        return uuidA;
+        s[14] = '4'
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1)
+        s[8] = s[13] = s[18] = s[23] = '-'
+        uuidA = s.join('')
+        return uuidA
       },
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        if (this.row.parentname === 'charge-manage') {
+          this.$emit('cancel-re')
+        } else {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
@@ -328,7 +332,7 @@
             let data = {
               f_userfiles_id: this.row.f_userfiles_id
             }
-            this.$resetpost('rs/logic/startup',data)
+            this.$resetpost('rs/logic/startup', data)
           }
         })
       },
@@ -338,11 +342,11 @@
           f_userfiles_id: this.row.f_userfiles_id
         }
         if (this.row.f_network_valve !== '1') {
-           this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
-           this.row.f_network_valve = '1'
+          this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+          this.row.f_network_valve = '1'
         } else {
-            this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
-            this.row.f_network_valve = null
+          this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+          this.row.f_network_valve = null
         }
       },
       // 阀控管理

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="binary flex" >
     <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
-      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
+      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel" @cancel-re="cancelRe"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
           <record-query-user :row="row"></record-query-user>
@@ -104,7 +104,7 @@ import ChangeRecord from './ic_detail/ChangeRecord'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
 export default {
     title: '用户详细信息',
-    props: ['f_userfiles_id', 'f_userinfo_id','f_userinfo_code'],
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname'],
     components: {
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
@@ -155,19 +155,24 @@ export default {
           condition = `f_userfiles_id = '${this.f_userfiles_id}'`
         } else if (this.f_userinfo_id) {
           condition = `f_userinfo_id = '${this.f_userinfo_id}'`
-        }else if (this.f_userinfo_code){
+        } else if (this.f_userinfo_code) {
           condition = `f_userinfo_code = '${this.f_userinfo_code}'`
         }
 
         let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
           {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
       },
 
       cancel (val) {
         this.$emit('cancel-main', val)
       },
 
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
       butOper (val) {
         this.name = val
       }

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -126,7 +126,7 @@
           <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >左&ensp;右&ensp;表</label>
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
           <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
         </div>
         <div class="row">
@@ -158,7 +158,7 @@
           <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >建表日期</label>
+          <label class = "col-sm-5 " >建档日期</label>
           <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
         </div>
         <div class="row">