npm - sale-client - Versions diffs - 3.5.69 → 3.5.71 - Mend

sale-client 3.5.69 → 3.5.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/build/dev-server.js +164 -164
package/package.json +1 -1
package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue +4 -4
package/src/filiale/guangxi/CardChangeFill.vue +2 -0
package/src/filiale/guangxi/CardMeterChargeCancel.vue +1 -0
package/src/filiale/guangxi/CardService.js +1 -0
package/src/filiale/guangxi/PrintBill.vue +4 -2
package/src/filiale/rizhao/UserGeneralInfoTest.vue +1 -0
package/src/filiale/shiquan/WebMeterInfo.vue +80 -0
package/src/filiale/shiquan/WebMeterList.vue +437 -0
package/src/filiale/shiquan/sale.js +4 -0
package/src/main.js +22 -22

package/build/dev-server.js CHANGED Viewed

@@ -1,164 +1,164 @@
-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://121.36.106.17:8400'
-// var fuwu = 'http://121.36.106.17: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
-  },
-  '/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(8085, 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://117.33.181.102:8400/'
+// var fuwu = 'http://121.36.106.17: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
+  },
+  '/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://117.33.181.102:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: 'http://39.108.82.124:8400/'
+  },
+  '/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(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json CHANGED Viewed

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

package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue CHANGED Viewed

@@ -220,8 +220,8 @@
       //   this.typenumberList = this.$appdata.getParam(val)
       // },
       selectoperator () {
-        let f_operator = this.model.operator
-        console.log('处理签的this.f_operatorid', this.f_operatorid)
+        let f_operator = this.model.f_operator
+        console.log('处理签的this.model.f_operatorid', this.model.f_operator)
         let http = new HttpResetClass()
         http.load('POST', 'rs/logic/findOperator',
           {f_operator: f_operator},
@@ -230,10 +230,10 @@
           if(res.data.length>0){
             this.model.f_operatorid = res.data[0].id
           }else{
-            this.model.operator=''
+            this.model.f_operator=''
             this.$showAlert('操作员信息未找到，请在参数管理进行添加','warning',2000)
           }
-            console.log('this.f_operatorid', this.f_operatorid)
+            console.log('this.model.f_operatorid', this.model.f_operatorid)
           })
       },
       editclose () {

package/src/filiale/guangxi/CardChangeFill.vue CHANGED Viewed

@@ -178,6 +178,7 @@
   import {HttpResetClass} from 'vue-client'
   import CardService from './CardService'
+  import PrintBill from './PrintBill'
 let preamountGen = async function (self) {
     let calFee = (self.model.f_totalcost - 0) + (self.model.f_fill_money - 0)
@@ -329,6 +330,7 @@ let preamountGen = async function (self) {
   export default {
     title: '换表补气',
+    component: {PrintBill},
     data () {
       return {
         config: {

package/src/filiale/guangxi/CardMeterChargeCancel.vue CHANGED Viewed

@@ -154,6 +154,7 @@ let cardChargeCancelGen = async function (self) {
   self.row.cardInfo = self.cardData
   self.model = Object.assign({}, self.model, self.correctModel)
   let res = null
+  debugger
   if (self.xmodel.id) {
     res = await CardService.cardAndFillGasCancel(self.model, self.xmodel, self.row)
   } else {

package/src/filiale/guangxi/CardService.js CHANGED Viewed

@@ -401,6 +401,7 @@ let sellCancelGen = async function (model, row) {
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         await rollbackGen(result, model, row)
       } else {
+        await modify(row.f_userfiles_id, '0', '2')
         Vue.showAlert('撤销成功', 'success', 2000)
         return result
       }

package/src/filiale/guangxi/PrintBill.vue CHANGED Viewed

@@ -38,12 +38,14 @@
     let temp = {
       reprint: "'正常'",
       operator: `'${self.$login.f.name}'`,
-      condition: self.data.id
+      condition: self.data.id,
+      fillgasid: ''
     }
     if (self.data.fillgasid) {
-      temp.fillgasid = `"${self.data.fillgasid}"`
+      temp.fillgasid = `${self.data.fillgasid}`
     }
     console.log('self.billData.url:', self.billData.url)
+    debugger
     self.bill = new DataModel(self.billData.url, temp)
     await self.bill.search(self.data.id)
     // 获取发票号

package/src/filiale/rizhao/UserGeneralInfoTest.vue CHANGED Viewed

@@ -339,6 +339,7 @@ export default {
       if (this.fileSaveData.userinfo.f_userinfo_id) {
         if (this.row.f_user_state === '预备' && this.fileSaveData.userinfo.f_user_state === '正常') {
           this.fileSaveData.modifyReason = this.reason = '建档（档案信息完善）'
+          this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
         } else {
           this.reason = '其他'
           this.fileSaveData.modifyReason = ''

package/src/filiale/shiquan/WebMeterInfo.vue ADDED Viewed

@@ -0,0 +1,80 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main': !iseditmetetinfo,'binary-left': iseditmetetinfo}" :style="{width:iseditmetetinfo ? '50%' : '100%'}">
+      <web-meter-list style="width:auto;" :styles="iseditmetetinfo?'form-group col-sm-3':'form-group col-sm-2'" :showfields="iseditmetetinfo?false:true" v-ref:list  @dblclick="showeditinfo"></web-meter-list>
+    </div>
+    <div class="binary-right" style="width:50%" v-if="iseditmetetinfo" >
+      <edit-meter-info :oldmeter="row" v-if="ismeterinfo" :f_filialeid="f_filialeid" @close="closeedit" style="overflow-y: auto;"></edit-meter-info>
+      <use-web-meter :meterinfos="meterinfos"  v-if="isUseMeter" @close="closeedit" style="overflow-y: auto;"></use-web-meter>
+      <!--<ul class="nav nav-tabs">-->
+        <!--<li class="active"><a>操作历史</a></li>-->
+      <!--</ul>-->
+      <!--<meter-history :id="row.id" @close="closeedit" style="height:30%"></meter-history>-->
+    </div>
+  </div>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+  import * as WebmeterUtil from '../../components/WebmeterUtil'
+  import * as webMeterList from './WebMeterList'
+  import * as meterHistory from '../../components/webMeter/webInfo/MeterHistory'
+  import Vue from 'vue'
+  export default {
+    components: {webMeterList, meterHistory},
+    title: '表计信息',
+    data () {
+      return {
+        model: new PagedList('rs/sql/singleTable_OrderBy', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
+        f_filialeid: '',
+        iseditmetetinfo: false,
+        row: {},
+        criteriaShow: false,
+        show: false,
+        isUseMeter: false,
+        meterinfos: [],
+        ismeterinfo: false
+      }
+    },
+    ready () {
+    },
+    methods: {
+      showeditinfo (obj) {
+        console.log('====================obj')
+        if (obj) {
+          this.row = obj
+          this.iseditmetetinfo = true
+          this.ismeterinfo = true
+          this.isUseMeter = false
+        }
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      clearmsg () {
+        this.$refs.paged.$refs.criteria.model = {}
+      },
+      closeedit () {
+        this.iseditmetetinfo = false
+        this.isUseMeter = false
+        this.ismeterinfo = false
+        this.$refs.list.search()
+      }
+    }
+  }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+  }
+</style>

package/src/filiale/shiquan/WebMeterList.vue ADDED Viewed

@@ -0,0 +1,437 @@
+<template style="position: absolute;">
+  <div id="WebMeterList">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.selfSearch'>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row" width="100%">
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;表钢号</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber"
+                       condition="f_meternumber='{}'" placeholder="表钢号" >
+              </div>
+              <div class="row">
+              <div style="float:right">
+                <button class="button_search"  @click="search()" v-el:cba>查询</button>
+                <button class="button_search" @click="$parent.$parent.addmeter()">新增</button>
+                <button class="button_search" @click="$parent.$parent.useMeter()">领用</button>
+                <button class="button_export" @click="$parent.$parent.importFile">导入</button>
+                <export-excel :data="$parent.$parent.getCondition" :field="$parent.$parent.getfield" :choose-col="true" v-ref:excel attach="webmeterlist"
+                  sqlurl="rs/logic/saleExport" sql-name="webMeterInfo" template-name='表计信息导出'>
+                </export-excel>
+                <button  class="button_search" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载</button>
+                <button class="button_search" @click="$parent.$parent.clearmsg">清空</button>
+                <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >表计电话</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_meter_phone"
+                       condition="f_meter_phone='{}'" placeholder="表计电话">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;IMEI码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_imei"
+                       condition="f_imei='{}'" placeholder="IMEI码">
+              </div>
+              <res-select-group  :show-component="['company','department','operator']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              <!--<div :class="$parent.$parent.styles">-->
+                <!--<label class="font_normal_body">组织机构</label>-->
+                <!--<res-select restype='organization'-->
+                            <!--:is-mul="false"-->
+                            <!--:initresid="$parent.$parent.curorgid"-->
+                            <!--@res-select="$parent.$parent.getorgCur">-->
+                <!--</res-select>-->
+              <!--</div>-->
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">气表品牌</label>
+                <v-select
+                        placeholder='气表品牌'
+                        :value.sync="model.f_meter_brand"
+                        style="width:60%"
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrand'
+                        close-on-select
+                        condition="f_meter_brand='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">安装状态</label>
+                <v-select
+                        placeholder='安装状态'
+                        :value.sync="model.aa"
+                        style="width:60%"
+                        v-model="model.aa"
+                        :options='$parent.$parent.azstate'
+                        close-on-select
+                        condition="aa='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;批次&nbsp;&nbsp;&nbsp;</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_batch_number"
+                       condition="f_batch_number like '%{}%'" placeholder="批次">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class="font_normal_body">是否领用</label>
+                <v-select
+                  placeholder='是否领用'
+                  :value.sync="model.f_is_receive"
+                  style="width:60%"
+                  v-model="model.f_is_receive"
+                  :options='$parent.$parent.isreceived'
+                  close-on-select
+                  condition="f_is_receive='{}'">
+                </v-select>
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >&nbsp;&nbsp;&nbsp;领用人</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_receive_unit"
+                       condition="f_receive_unit like '%{}%'" placeholder="领用人">
+              </div>
+              <div :class="$parent.$parent.styles" >
+                <label class=" font_normal_body" >领用电话</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_receive_phone"
+                       condition="f_receive_phone like '%{}%'" placeholder="领用电话">
+              </div>
+              <div :class="$parent.$parent.styles">
+                <label class="font_normal_body">领用日期</label>
+                <datepicker id="startDate" placeholder=""
+                            v-model="model.f_start_date"
+                            :value.sync="model.f_start_date"
+                            :disabled-days-of-Week="[]"
+                            style="width: 60%"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            condition="f_receive_date >= '{}'">
+                </datepicker>
+              </div>
+              <div :class="$parent.$parent.styles">
+                <label class="font_normal_body">&emsp;&emsp;至&emsp;</label>
+                <datepicker id="endDate" placeholder=""
+                            v-model="model.f_end_date"
+                            :value.sync="model.f_end_date"
+                            style="width: 60%"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            condition="f_receive_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid id="webmeterinfo" :model="model"  class="list_area table_sy"  partial='list'  v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <input type="checkbox"  @click="$parent.$parent.$parent.addOrRemove()">
+              </th>
+              <th><nobr>序号</nobr></th>
+              <th><nobr>表号</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>imei码</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>imsi码</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>批次</nobr></th>
+<!--              <th><nobr>设备号</nobr></th>-->
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>表计电话</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>表通道类型</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>阀控标识</nobr></th>
+<!--              <th><nobr>表通讯序号</nobr></th>-->
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>设备地址</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>终端名称</nobr></th>
+<!--              <th><nobr>厂商代码</nobr></th>-->
+              <th><nobr>状态</nobr></th>
+              <th><nobr>气表品牌</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>设备号</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>气表年限</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>生产日期</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>批次号</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>气表厂家</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>采购人</nobr></th>
+              <th v-if="$parent.$parent.$parent.showfields"><nobr>采购时间</nobr></th>
+              <th><nobr>是否领用</nobr></th>
+              <th><nobr>领用人</nobr></th>
+              <th><nobr>领用时间</nobr></th>
+              <th><nobr>领用电话</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' >
+            <td style="text-align:center">
+              <input type="checkbox" v-model="$parent.$parent.$parent.$parent.meterinfos" :disabled="row.f_receive==='已领用'" :value="row" @click="$parent.$parent.$parent.checkboxMeter()" >
+            </td>
+            <td style="text-align: center;" >{{$index+1}}</td>
+            <td style="text-align: center" >{{row.f_meternumber}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_imei}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_imsi}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_batch_number}}</td>
+<!--            <td style="text-align: center" >{{row.f_device_id}}</td>-->
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_meter_phone}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_iot_type}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_valvemark}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_device_address}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_terminal_id}}</td>
+<!--            <td style="text-align: center" >{{row.f_vender}}</td>-->
+            <td style="text-align: center" >{{row.aa}}</td>
+            <td style="text-align: center" >{{row.f_meter_brand}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_device_id}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_years}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_manufacture_date}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_batch_number}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_manufacturers}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_purchaser}}</td>
+            <td style="text-align: center" v-if="$parent.$parent.$parent.showfields">{{row.f_purchase_date}}</td>
+            <td style="text-align: center" >{{row.f_receive}}</td>
+            <td style="text-align: center" >{{row.f_receive_unit}}</td>
+            <td style="text-align: center" >{{row.f_receive_date}}</td>
+            <td style="text-align: center" >{{row.f_receive_date}}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+  </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" multiple></file-upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+  import * as WebmeterUtil from '../../components/WebmeterUtil'
+  import Vue from 'vue'
+  let readyGen = async function (self) {
+    await self.$LoadParams.loadParam()
+    self.initQueryParam()
+      // self.reflash()
+  }
+  export default {
+    title: '表计管理',
+    props:['showfields','styles'],
+    data () {
+      return {
+        getCondition: null,
+        getfield: null,
+        meterbrand: [],
+        azstate: [{label: '全部', value: ''}, {label: '已安装', value: '已安装'}, {label: '未安装', value: '未安装'}],
+        isreceived:[{label: '全部', value: ''}, {label: '已领用', value: '是'}, {label: '未领用', value: '否'}],
+        // curorgid: [this.$login.f.orgid],
+        orgCondtionStr: '',
+        // 公司下拉
+        initres: {
+          org: [],
+          dep: [],
+          user: []
+        },
+        model: new PagedList('rs/sql/webMeterInfo', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
+        headers: {'username': Vue.$login.f.name, 'blodid': WebmeterUtil.guid()},
+        criteriaShow: false,
+        f_orgid: '',
+        show: false,
+        meterinfos: [],
+        isAddOrMove: false
+      }
+    },
+    ready () {
+      this.loadGetField()
+      this.search()
+      readyGen(this)
+      this.$parent.meterinfos = []
+      console.log('this', this)
+      this.$refs.paged.$refs.criteria.model.f_table_state = ['正常']
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+      },
+      loadGetField () {
+        this.getfield = {
+          'f_meternumber': '表号',
+          'f_imei': 'imei码',
+          'f_imsi': 'imsi码',
+          'f_meter_phone': '表计电话',
+          'f_iot_type': '表通道类型',
+          'f_valvemark': '阀控标识',
+          'f_device_address': '设备地址',
+          'f_terminal_id': '终端名称',
+          'aa': '状态',
+          'f_meter_brand': '气表品牌',
+          'f_device_id': '设备号',
+          'f_years': '气表年限',
+          'f_manufacture_date': '生产日期',
+          'f_batch_number': '批次号',
+          'f_manufacturers': '气表厂家',
+          'f_purchaser': '采购人',
+          'f_purchase_date': '采购时间',
+          'f_receive': '是否领用',
+          'f_receive_unit': '领用人',
+          'f_receive_date': '领用时间',
+        }
+      },
+      downloadFiles(){
+        let downurl='rs/downloadfile/file?filename=表计导入模板';
+        this.$resetget(downurl,{}).then(res=>{
+          var link = document.createElement('a');
+          link.target="_blank"
+          link.href =downurl ;
+          link.setAttribute("download", "表计导入模板.xlsx"); //指定下载后的文件名，防跳转
+          document.body.appendChild(link);
+          link.click();
+        })
+      },
+      addOrRemove () {
+        this.$parent.meterinfos = []
+        if (this.isAddOrMove) {
+          this.$parent.meterinfos = []
+        } else {
+          this.model.rows.forEach((row) => {
+            if (row.f_receive !== '已领用') {
+              this.$parent.meterinfos.push(row)
+            }
+          })
+        }
+        this.isAddOrMove = !this.isAddOrMove
+      },
+      useMeter () {
+        console.log("meterinfos",this.$parent.meterinfos)
+        this.$parent.iseditmetetinfo = true
+        this.$parent.isUseMeter = true
+        this.$parent.ismeterinfo = false
+        console.log("1",this.$parent.iseditmetetinfo)
+        console.log("2",this.$parent.ismeterinfo)
+        console.log("3",this.$parent.isUseMeter)
+      },
+      checkboxMeter () {
+        console.log("这是当前页的meterinfos",this.meterinfos)
+        console.log("这是当前页的meterinfos",this.$parent.meterinfos)
+      },
+      initQueryParam () {
+        let arr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+              //  if(item.value.f_meter_type==='物联网表'){
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          arr.push(temp)
+               // }
+        })
+        this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      addmeter () {
+        this.$parent.row = {}
+        this.$parent.iseditmetetinfo = true
+        this.$parent.ismeterinfo = true
+        this.$parent.isUseMeter = false
+        this.$parent.f_filialeids = this.f_filialeids
+      },
+      clearmsg () {
+        this.$refs.paged.$refs.criteria.model = {}
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.$parent.meterinfos = []
+        if (!this.f_orgid) {
+          this.f_orgid = this.$login.f.orgid
+        }
+        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_filialeid in ('" + this.f_orgid + "')"
+        args.condition = `${args.condition} ` + f_orgstr
+        // if (this.f_orgid) {
+        //   args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
+        // }
+        this.getCondition = {condition: args.condition}
+        this.model.search(args.condition, args.model)
+      },
+      getorgCur (val) {
+        console.log('组织事件返回。。', val[0])
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+        this.$parent.f_filialeid = val[0]
+        this.search()
+      },
+      importFile () {
+        this.show = true
+      }
+    },
+    events: {
+      onFileUpload: function (file, res) {
+        console.log(this.$login.f, '======')
+        console.log(res)
+        let data = {
+          tablename: 't_meterinfo',
+          filepath: res.f_downloadpath,
+          info: {
+            f_orgid: this.$login.f.orgid ? this.$login.f.orgid : '',
+            f_orgname: this.$login.f.orgs ? this.$login.f.orgs : '',
+            f_depid: this.$login.f.depids ? this.$login.f.depids : '',
+            f_depname: this.$login.f.deps ? this.$login.f.deps : '',
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_filialeid: this.f_orgid === '' ? this.$login.f.orgid : this.f_orgid.replace(/[^0-9]/ig, '')
+          }
+        }
+        console.log(data, '++++++++++++++++++++++++++')
+        this.$resetpost('rs/logic/iot_meterinfo_import', {data: data}, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+          // window.location.href = '/excel/表具导入异常信息.txt';
+          let mes = '成功导入' + res.data.successnum + '条数据 '
+          if (res.data.successnum !== res.data.allnum) {
+            var link = document.createElement('a')
+            let path = '表具导入异常信息.txt'
+          // 本地
+            let pathName = 'http://' + location.host + '/excel/' + path
+            link.href = pathName
+            link.download = path
+            link.dispatchEvent(new MouseEvent('click'))
+            mes = mes + ',有 ' + (((res.data.allnum - 0) - (res.data.successnum - 0)) - 0) + ' 条数据导入失败,请确保气表品牌存在，且表号、IMEI号唯一，详细信息请查看表具导入异常信息.txt'
+          }
+          this.$showMessage(mes)
+          this.search()
+        })
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #WebMeterList {
+    .form-input-group label {
+      text-align: right;
+      width: auto;
+    }
+    .datapanel {
+      color: #333;
+      background-color: white;
+      box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+      padding: 10px 30px 10px 30px;
+      border-radius:15px;
+    }
+    #webmeterinfo {
+      tr > td {
+        white-space: nowrap;
+      }
+    }
+    #vc-exportexcel-webmeterlist {
+      margin: 0;
+    }
+  }
+</style>

package/src/filiale/shiquan/sale.js CHANGED Viewed

@@ -1,6 +1,10 @@
 // 分公司特殊组件页面注册
+import Vue from "vue";
 let specialComp = {
   // 售气收费 --收费gas-move
   'charge-manage': (resolve) => { require(['./ChargeManage'], resolve) },
+  // 表计管理
+  'web-meter-info': (resolve) => { require(['./WebMeterInfo'], resolve) }
 }
 exports.specialComp = specialComp

package/src/main.js CHANGED Viewed

@@ -1,22 +1,22 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-import App from './App'
-import { system } from 'system-clients'
-import sale from './sale'
-import { address } from 'address-client'
-import { ldap } from 'ldap-clients'
-import VueClipboard from 'vue-clipboard2'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-all()
-system(false)
-sale()
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import { all } from 'vue-client'
+import App from './App'
+import { system } from 'system-clients'
+import sale from './sale'
+import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+all()
+system(false)
+sale('guangxi')
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})