manage-client 4.1.141 → 4.1.143

package/build/dev-server.js

@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://192.168.50.67:31567/'
-const local = 'http://127.0.0.1:9026/'
+const server = 'http://121.36.106.17:31467/'
+const local = 'http://121.36.106.17:31467/'
 const proxyTable = {
   '/rs/logic/exportfile': {
     target: server
@@ -16,21 +16,21 @@ const proxyTable = {
     target: server
   },
   '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api': {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.141",
+    "version": "4.1.143",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/SellReport/ManageBusSummary.vue

@@ -132,10 +132,28 @@
         <button class="button_clear" @click="cancel()">取消</button>
       </footer>
     </modal>
+    <modal :show.sync="signatureModalShow" large backdrop="false" width="50%">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+        <h4 class="modal-title">业务员签名</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div style="text-align:center">
+          <canvas v-ref:signCanvas data-sign-canvas="true"
+                  style="border:1px solid #ccc; background:#fff; width:600px; height:300px; touch-action:none;">
+          </canvas>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_clear" @click="clearSignatureCanvas()">清除</button>
+        <button type="button" class="button_search" @click="saveSignatureAndSubmit()" :disabled="signatureUploadInProgress">保存并提交</button>
+        <button type="button" class="button_clear" @click="signatureModalShow=false">取消</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
 <script>
+import Vue from 'vue'
 import {DataModel} from 'vue-client'
 import co from 'co'
 
@@ -174,6 +192,16 @@ export default {
       },
       pushAuditData: {},
       pushAuditShow: false,
+      signatureModalShow: false,
+      signatureData: '',
+      signatureDrawn: false,
+      signatureUploadInProgress: false,
+      signing: false,
+      signLastX: 0,
+      signLastY: 0,
+      signDPR: 1,
+      signCanvasContext: null,
+      signatureCanvas: null,
       config: {
         hasAudit: false
       }
@@ -189,10 +217,21 @@ export default {
   },
   methods: {
     auditConfirm () {
+      // If no signature yet, require the reviewer to sign first
+      if (!this.pushAuditData.f_audit_person) {
+        this.$showMessage('请选择审核人')
+        return
+      }
+      if (!this.pushAuditData.signature) {
+        this.signatureModalShow = true
+        return
+      }
+
       const param = {
         f_type: '收费结账报表',
         f_requestparam: this.model.data,
         f_audit_person: this.pushAuditData.f_audit_person,
+        f_signature: this.pushAuditData.signature,
         f_otherparam: this.pushAuditData,
         f_operator: this.$login.f.name,
         f_operatorid: this.$login.f.id,
@@ -210,8 +249,286 @@ export default {
       }).then((res) => {
         this.pushAuditShow = false
         this.pushAuditData.f_audit_person = ''
+        this.pushAuditData.signature = ''
+      })
+    },
+    initSignCanvas () {
+      this.$nextTick(() => {
+        let canvas = this.$refs.signCanvas
+        if (!canvas) {
+          canvas = this.$el.querySelector('canvas[data-sign-canvas]') || document.querySelector('canvas[data-sign-canvas]')
+
+        }
+        const desiredW = 600
+        const desiredH = 300
+        canvas.width = desiredW
+        canvas.height = desiredH
+        canvas.style.width = desiredW + 'px'
+        canvas.style.height = desiredH + 'px'
+        const ctx = canvas.getContext('2d')
+        ctx.setTransform(1, 0, 0, 1, 0, 0)
+        ctx.fillStyle = '#fff'
+        ctx.fillRect(0, 0, desiredW, desiredH)
+        ctx.strokeStyle = '#000'
+        ctx.lineWidth = 2
+        ctx.lineCap = 'round'
+        ctx.lineJoin = 'round'
+        this.signCanvasContext = ctx
+        this.signing = false
+        this.signatureDrawn = false
+        this.destroySignCanvasListeners()
+        const getPoint = (event) => {
+          const rect = canvas.getBoundingClientRect()
+          let clientX = event.clientX
+          let clientY = event.clientY
+          if (event.touches && event.touches.length) {
+            clientX = event.touches[0].clientX
+            clientY = event.touches[0].clientY
+          } else if (event.changedTouches && event.changedTouches.length) {
+            clientX = event.changedTouches[0].clientX
+            clientY = event.changedTouches[0].clientY
+          }
+          if (clientX == null || clientY == null) return null
+          const x = (clientX - rect.left) * (canvas.width / rect.width)
+          const y = (clientY - rect.top) * (canvas.height / rect.height)
+          return { x, y }
+        }
+
+        const onStart = (event) => {
+          event.preventDefault()
+          const point = getPoint(event)
+          if (!point) return
+          this.signing = true
+          this.signatureDrawn = true
+          this.signLastX = point.x
+          this.signLastY = point.y
+        }
+        const onMove = (event) => {
+          if (!this.signing) return
+          event.preventDefault()
+          const point = getPoint(event)
+          if (!point) return
+          const ctx2 = this.signCanvasContext
+          ctx2.beginPath()
+          ctx2.moveTo(this.signLastX, this.signLastY)
+          ctx2.lineTo(point.x, point.y)
+          ctx2.stroke()
+          this.signLastX = point.x
+          this.signLastY = point.y
+        }
+        const onEnd = (event) => {
+          if (this.signing) {
+            event.preventDefault()
+          }
+          this.signing = false
+        }
+        canvas.addEventListener('mousedown', onStart)
+        canvas.addEventListener('mousemove', onMove)
+        canvas.addEventListener('mouseup', onEnd)
+        canvas.addEventListener('mouseleave', onEnd)
+        canvas.addEventListener('touchstart', onStart, {passive:false})
+        canvas.addEventListener('touchmove', onMove, {passive:false})
+        canvas.addEventListener('touchend', onEnd)
+        canvas.addEventListener('touchcancel', onEnd)
+
+        this._signCanvasListeners = { canvas, onStart, onMove, onEnd }
+        this.signatureCanvas = canvas
+      })
+    },
+    destroySignCanvasListeners () {
+      if (!this._signCanvasListeners) return
+      const { canvas, onStart, onMove, onEnd } = this._signCanvasListeners
+      canvas.removeEventListener('mousedown', onStart)
+      canvas.removeEventListener('mousemove', onMove)
+      canvas.removeEventListener('mouseup', onEnd)
+      canvas.removeEventListener('mouseleave', onEnd)
+      canvas.removeEventListener('touchstart', onStart)
+      canvas.removeEventListener('touchmove', onMove)
+      canvas.removeEventListener('touchend', onEnd)
+      canvas.removeEventListener('touchcancel', onEnd)
+      this._signCanvasListeners = null
+      this.signatureCanvas = null
+    },
+    getSignCanvasElement () {
+      return this.$refs.signCanvas || this.signatureCanvas || this.$el.querySelector('canvas[data-sign-canvas]') || document.querySelector('canvas[data-sign-canvas]')
+    },
+    getSignPoint (event) {
+      const canvas = this.getSignCanvasElement()
+      if (!canvas) return null
+      const rect = canvas.getBoundingClientRect()
+      let clientX = event.clientX
+      let clientY = event.clientY
+
+      if (event.touches && event.touches.length) {
+        clientX = event.touches[0].clientX
+        clientY = event.touches[0].clientY
+      } else if (event.changedTouches && event.changedTouches.length) {
+        clientX = event.changedTouches[0].clientX
+        clientY = event.changedTouches[0].clientY
+      }
+
+      if (clientX == null || clientY == null) return null
+
+      // Use offset within canvas bounding box
+      const x = (clientX - rect.left) * (canvas.width / rect.width)
+      const y = (clientY - rect.top) * (canvas.height / rect.height)
+      return { x, y }
+    },
+    signStart (event) {
+      // legacy support: keep method but not used by native listeners
+      if (!this.signCanvasContext) return
+      const point = this.getSignPoint(event)
+      if (!point) return
+      this.signing = true
+      this.signatureDrawn = true
+      this.signLastX = point.x
+      this.signLastY = point.y
+    },
+    signMove (event) {
+      if (!this.signing || !this.signCanvasContext) return
+      const point = this.getSignPoint(event)
+      if (!point) return
+      const ctx = this.signCanvasContext
+      ctx.beginPath()
+      ctx.moveTo(this.signLastX, this.signLastY)
+      ctx.lineTo(point.x, point.y)
+      ctx.stroke()
+      this.signLastX = point.x
+      this.signLastY = point.y
+    },
+    signEnd () {
+      this.signing = false
+    },
+    clearSignatureCanvas () {
+      const canvas = this.getSignCanvasElement()
+      const ctx = this.signCanvasContext || (canvas ? canvas.getContext('2d') : null)
+      if (!canvas || !ctx) {
+        return
+      }
+
+      const desiredW = 600
+      const desiredH = 300
+      ctx.setTransform(1, 0, 0, 1, 0, 0)
+      ctx.clearRect(0, 0, desiredW, desiredH)
+      ctx.fillStyle = '#fff'
+      ctx.fillRect(0, 0, desiredW, desiredH)
+      this.signatureDrawn = false
+      this.pushAuditData.signature = ''
+    },
+    getUploadPathFromResponse (res) {
+      return res && (res.id)
+    },
+    canvasToBlob (canvas) {
+      return new Promise((resolve, reject) => {
+        if (canvas.toBlob) {
+          canvas.toBlob((blob) => {
+            if (blob) {
+              resolve(blob)
+            } else {
+              reject(new Error('canvas toBlob returned null'))
+            }
+          }, 'image/png')
+        } else {
+          try {
+            const dataURL = canvas.toDataURL('image/png')
+            const byteString = atob(dataURL.split(',')[1])
+            const mimeString = dataURL.split(',')[0].split(':')[1].split(';')[0]
+            const ab = new ArrayBuffer(byteString.length)
+            const ia = new Uint8Array(ab)
+            for (let i = 0; i < byteString.length; i++) {
+              ia[i] = byteString.charCodeAt(i)
+            }
+            resolve(new Blob([ab], { type: mimeString }))
+          } catch (err) {
+            reject(err)
+          }
+        }
+      })
+    },
+    uploadSignatureFile () {
+      return new Promise(async (resolve, reject) => {
+        const canvas = this.getSignCanvasElement()
+        if (!canvas) {
+          reject(new Error('签名画布未找到'))
+          return
+        }
+        let blob
+        try {
+          blob = await this.canvasToBlob(canvas)
+        } catch (err) {
+          reject(err)
+          return
+        }
+
+        const form = new FormData()
+        form.append('file', blob, 'signature.png')
+
+        const xhr = new XMLHttpRequest()
+        xhr.open('POST', 'api/af-revenue/file/uploadFile', true)
+        if (Vue.$login && Vue.$login.jwt) {
+          xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
+          xhr.setRequestHeader('Token', Vue.$login.jwt)
+        }
+
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState < 4) return
+          if (xhr.status < 400) {
+            try {
+              const res = JSON.parse(xhr.responseText)
+              const uploadPath = this.getUploadPathFromResponse(res)
+              if (!uploadPath) {
+                reject(new Error('上传成功但未返回有效路径'))
+                return
+              }
+              resolve(uploadPath)
+            } catch (err) {
+              reject(err)
+            }
+          } else {
+            let err
+            try {
+              err = JSON.parse(xhr.responseText)
+            } catch (parseErr) {
+              err = new Error(xhr.statusText || '签名上传失败')
+            }
+            reject(err)
+          }
+        }.bind(this)
+
+        xhr.onerror = function () {
+          reject(new Error('签名文件上传网络错误'))
+        }
+
+        xhr.send(form)
       })
     },
+    async saveSignatureAndSubmit () {
+      if (!this.signatureDrawn) {
+        if (this.$showMessage) this.$showMessage('请先签名')
+        return
+      }
+
+      const canvas = this.getSignCanvasElement()
+      if (!canvas) {
+        if (this.$showMessage) this.$showMessage('签名画布未找到，请重新打开签名弹窗')
+        return
+      }
+
+      if (this.signatureUploadInProgress) {
+        return
+      }
+      this.signatureUploadInProgress = true
+      try {
+        const uploadPath = await this.uploadSignatureFile()
+        this.pushAuditData.signature = uploadPath
+        this.signatureModalShow = false
+        this.auditConfirm()
+      } catch (err) {
+        if (this.$showMessage) this.$showMessage('签名上传失败，请重试')
+      } finally {
+        this.signatureUploadInProgress = false
+      }
+    },
     async getAuditor () {
       await this.$MagGetSaleParam.initinputtor()
       console.log('查询到的人员：', await this.$MagGetSaleParam.initinputtor())
@@ -221,6 +538,7 @@ export default {
     },
     cancel () {
       this.pushAuditShow = false
+      this.pushAuditData.signature = ''
     },
     pushAudit () {
       if (this.model.data === null || this.model.data === ' ') {
@@ -278,6 +596,15 @@ export default {
       }
       this.spans = len
     }
+    ,
+    signatureModalShow (val) {
+      console.log('[ManageBusSummary] signatureModalShow watcher', val)
+      if (val) {
+        this.initSignCanvas()
+      } else {
+        this.destroySignCanvasListeners()
+      }
+    }
   },
   computed: {
     charge_state () {

package/src/filiale/meihekou/ReportDataQuery.vue

@@ -0,0 +1,383 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+<!--                <div class="col-sm-2">-->
+<!--                  <label class="font_normal_body">组织机构</label>-->
+<!--                  <res-select :initresid="$parent.$parent.org"-->
+<!--                              style="width:60%"-->
+<!--                              @res-select="$parent.$parent.getorg"-->
+<!--                              restype='organization'>-->
+<!--                  </res-select>-->
+
+<!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&emsp;公司&emsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="manage_getReportDataQuery" template-name='结算查询导出'
+                                :choose-col="true"></export-excel>
+                  <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="col-sm-2 form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber like '%{}%'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
+                         condition="f_residential_area like '%{}%'" placeholder='小区'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select
+                    placeholder='气表品牌'
+                    :value.sync="model.f_meter_brand"
+                    v-model="model.f_meter_brand"
+                    :options='$parent.$parent.meterbrands'
+                    close-on-select
+                    condition="f_meter_brand='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body">气表型号</label>
+                  <v-select
+                            placeholder='气表型号'
+                            :value.sync="model.f_meter_style"
+                            v-model="model.f_meter_style"
+                            :options='$parent.$parent.metertypes'
+                            close-on-select
+                            condition="f_meter_style='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">插入时间</label>
+                  <datepicker id="startDate" placeholder="插入时间" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_insert_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endDate" placeholder="插入时间" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_insert_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气类型</label>
+                  <v-select :value.sync="model.f_user_nature" v-model="model.f_user_nature"
+                            :options='$parent.$parent.usernatures' placeholder='请选择'
+                            condition="f_user_nature = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户等级</label>
+                  <v-select :value.sync="model.f_user_level"
+                            :options='$parent.$parent.usergrade'
+                            placeholder='请选择' v-model="model.f_user_level"
+                            condition="f_user_level = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" >档案抄表员</label>
+                  <v-select :value.sync="model.f_dainputtores"
+                            v-model="model.f_dainputtores"
+                            :options='$parent.$parent.dainputtores' placeholder='请选择'
+                            condition="f_inputtor = '{}'"
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th v-for="row in $parent.$parent.$parent.headData">
+                  <nobr>{{row}}</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr v-for="row in $parent.$parent.$parent.model.rows">
+                <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
+                  <nobr v-if="item == 'f_lowlithiumbattery'">{{row[item] == 1 ? '是' : '否'}}</nobr>
+                  <nobr v-if="item == 'f_magneticinterference'">{{row[item] == 1 ? '异常' : '正常'}}</nobr>
+                  <nobr v-if="item != 'f_magneticinterference' && item != 'f_lowlithiumbattery'">{{row[item]}}</nobr>
+                </td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import tableConfig from './config/tableConfig'
+  import exportConfig from './config/exportConfig'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+  }
+  export default {
+    title: '上报数据查询',
+    data() {
+      return {
+        other:[],
+        sumsmodel: {},
+        footer:[],
+        model: new PagedList('api/af-revenue/sql/manage_getReportDataQuery', 20, {}),
+        criteriaShow: false,
+        config: {
+          fieldMapping: {
+              f_userinfo_code: '客户编号',
+              f_user_name: '客户名称'
+          }
+        },
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        headData: [],
+        bodyData: [],
+        gasproperties:[],
+        dainputtores:[{label: '全部',value: ''}],
+        orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
+        resshow:['company'],
+        org:[this.$login.f.orgid],
+        meterbrands:[]
+      }
+    },
+    created () {
+     this.config.fieldMapping=tableConfig.ReportDataQuery
+      console.log("========================")
+      console.log(this.config.fieldMapping)
+      var item="用户编号"
+      console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+      console.log(this.config.fieldMapping[item])
+      this.headData=Object.keys(this.config.fieldMapping)
+      // for(var i=0;i<this.config.fieldMapping;i++){
+      //   this.headData.push(this.config.fieldMapping[i])
+      // }
+
+    },
+    ready() {
+      this.hqdainputtores()
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async hqdainputtores() {
+        let param = {
+          items: 'DISTINCT f_inputtor',
+          tablename: 't_userfiles',
+          condition: `  f_inputtor is NOT null`,
+        }
+        let getDainputtores = await new HttpResetClass().load("POST",'api/af-revenue/sql/singleTableParam', {data: param}, {
+          resolveMsg: null,
+          rejectMsg: null
+        });
+        if (getDainputtores.data.length > 0) {
+          let rs = [];
+          getDainputtores.data.forEach((item) => {
+            if (item.f_inputtor.length > 0) {
+              let temp = {
+                label: item.f_inputtor,
+                value: item.f_inputtor
+              };
+              rs.push(temp);
+            }
+          })
+          this.dainputtores = [{label: '全部', value: ''}, ...rs];
+        } else {
+          this.dainputtores = [{label: '全部', value: ''}];
+        }
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp )
+          }
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+        // 查询到数据进行处理
+        // if (this.model.rows.length > 0) {
+        //   this.bodyData =  Object.keys(this.model.rows[0])
+        // }
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
+        }else
+        {
+          this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+        }
+      },
+      // getorg(obj) {
+      //   // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+      //   //   this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
+      //   // }else{
+      //   //   this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+      //   // }
+      //   // this.orgname = obj.res
+      // },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+
+      // getRes(obj) {
+      //   this.orgCondtionStr = obj
+      // }
+      getotherfooter() {
+        this.other = [];
+        this.footer = [];
+        let otherInData = [];
+        let secondLine = [
+          `开始时间: ${this.$refs.paged.$refs.cri.model.startDate}`,
+          `结束时间: ${this.$refs.paged.$refs.cri.model.startDate}`
+        ];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = []
+
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+        this.other.push(secondLine);
+      }
+    },
+    watch: {
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+    },
+    computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      usernatures(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      usergrade(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
+      },
+      getCondition() {
+        return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+        }
+      },
+      getfield() {
+        return exportConfig.ReportDataConfig
+      }
+    }
+  }
+</script>

package/src/filiale/meihekou/config/exportConfig.js

@@ -1575,6 +1575,57 @@ export default {
     'f_wosi_lng': '我司',
     'f_yinzhen_lng': '引镇',
     'finaltotal': '一日'
+  },
+  // 上报数据
+  ReportDataConfig: {
+    'f_userinfo_code': '用户编号',
+    'f_user_name': '用户名称',
+    'f_address': '用户地址',
+    'f_residential_area': '小区',
+    'f_user_type': '用户类型',
+    'f_user_nature': '用气类型',
+    'f_gasproperties': '用气性质',
+    'f_user_level': '用户等级',
+    'f_inputtor': '档案抄表员',
+    'f_meternumber': '表号',
+    'f_tablebase': '本次抄表底数',
+    'f_last_tablebase': '上次抄表底数',
+    'f_jval': '表计剩余余额',
+    'f_hand_date': '抄表日期',
+
+    'f_last_hand_date': '上次抄表日期',
+    'f_gas_date': '开户日期',
+    'f_software_version': '软件版本号',
+    'f_table_msg': '表状态信息',
+    'f_last_meter_state_msg': '上次表状态信息',
+
+    'f_insert_date': '插入日期',
+    'f_last_insertdate': '上次插入日期',
+    'f_whether_clear': '是否结算',
+    'f_super_gas': '超用气量',
+    'f_electricity': '电量等级',
+
+    'f_times': '购气次数',
+    'f_price': '单价',
+    'f_signal': '信号强度',
+    'f_snr': '信噪比',
+    'f_batterylevel': '电压',
+
+    'f_networkshutvalve': '阀门强制状态',
+    'f_valvestate': '阀门状态',
+    'f_wmprepaytype': '计量类型',
+    'f_upload_type': '上报类型',
+    'f_moneystate': '金额状态',
+
+    'f_lowlithiumbattery': '电压状态',
+    'f_magneticinterference': '磁干扰异常',
+    'f_meterbalanceamt': '表内剩余金额',
+    'f_meterdebitamt': '表内累计充值金额',
+    'f_compensatestate': '补偿状态',
+    'f_meter_brand': '气表品牌',
+    'f_meter_style': '气表型号',
+    'f_orgname': '分公司'
+
   }
 
 }

package/src/filiale/meihekou/config/tableConfig.js

@@ -1,48 +1,61 @@
 export default{
-  //查询页面的字段名和中文对应
-  ReportDataQuery:
-    {
-      "用户编号":"f_userinfo_code",
-      "用户名称":"f_user_name",
-      "表号":"f_meternumber",
-      "本次抄表底数":"f_tablebase",
-      "上次抄表底数":"f_last_tablebase",
-      "表计剩余余额":"f_jval",
-      "抄表日期":"f_hand_date",
-
-      "上次抄表日期":"f_last_hand_date",
-      "开户日期":"f_gas_date",
-      "软件版本号":"f_software_version",
-      "表状态信息":"f_table_msg",
-      "上次表状态信息":"f_last_meter_state_msg",
-
-      "插入日期":"f_insert_date",
-      "上次插入日期":"f_last_insertdate",
-      "是否结算":"f_whether_clear",
-      "超用气量":"f_super_gas",
-      "电量等级":"f_electricity",
-
-      "购气次数":"f_times",
-      "单价":"f_price",
-      "信号强度":"f_signal",
-      "信噪比":"f_snr",
-      "电压":"f_batterylevel",
-
-      "阀门强制状态":"f_networkshutvalve",
-      "阀门状态":"f_valvestate",
-      "计量类型":"f_wmprepaytype",
-      "上报类型":"f_upload_type",
-      "金额状态":"f_moneystate",
-
-      "电压状态":"f_lowlithiumbattery",
-      "磁干扰异常":"f_magneticinterference",
-      "表内剩余金额":"f_meterbalanceamt",
-      "表内累计充值金额":"f_meterdebitamt",
-      "补偿状态":"f_compensatestate",
-      "气表品牌":"f_meter_brand",
-      "气表型号":"f_meter_style",
-      "分公司":"f_orgname"
-
-    }
+// 查询页面的字段名和中文对应
+  ReportDataQuery: {
+    '用户编号': 'f_userinfo_code',
+    '用户名称': 'f_user_name',
+    '用户地址': 'f_address',
+    '小区': 'f_residential_area',
+    '用户类型': 'f_user_type',
+    '用气类型': 'f_user_nature',
+    '用气性质': 'f_gasproperties',
+    '用户等级': 'f_user_level',
+    '档案抄表员': 'f_inputtor',
+    '表号': 'f_meternumber',
+    '本次抄表底数': 'f_tablebase',
+    '上次抄表底数': 'f_last_tablebase',
+    '表上余额': 'f_jval',
+    '抄表日期': 'f_hand_date',
+
+    '上次抄表日期': 'f_last_hand_date',
+    '开户日期': 'f_gas_date',
+    '软件版本号': 'f_software_version',
+    '表状态信息': 'f_table_msg',
+    '上次表状态信息': 'f_last_meter_state_msg',
+
+    '插入日期': 'f_insert_date',
+    '上次插入日期': 'f_last_insertdate',
+    '是否结算': 'f_whether_clear',
+    '超用气量': 'f_super_gas',
+    '电量等级': 'f_electricity',
+
+    '购气次数': 'f_times',
+    '单价': 'f_price',
+    '信号强度': 'f_signal',
+    '信噪比': 'f_snr',
+    '电压': 'f_batterylevel',
+
+    '阀门强制状态': 'f_networkshutvalve',
+    '阀门状态': 'f_valvestate',
+    '计量类型': 'f_wmprepaytype',
+    '上报类型': 'f_upload_type',
+    '金额状态': 'f_moneystate',
+
+    '增加工况瞬时': 'operatingModeFlow',
+    '标况瞬时': 'standardConditionFlow',
+    '开盖状态': 'f_SplitAlarm',
+    '液晶状态': 'f_XTIpllStopFlag',
+    '声速': 'soundVelocity',
+
+    '外电低电': 'f_lowlithiumbattery',
+    '磁干扰异常': 'f_magneticinterference',
+    '表内剩余金额': 'f_meterbalanceamt',
+    '表内累计充值金额': 'f_meterdebitamt',
+    '补偿状态': 'f_compensatestate',
+    '气表品牌': 'f_meter_brand',
+    '气表型号': 'f_meter_style',
+    '分公司': 'f_orgname',
+    '部门': 'f_depname'
+
+  }
 
 }

package/src/filiale/meihekou/webmeterManage.js

@@ -6,4 +6,6 @@ export default function () {
   Vue.component('new-webmeter-user-gas-all', (resolve) => { require(['./UserGasAll'], resolve) })
   // 上报统计分析--抄表分析
   Vue.component('user-gas-list', (resolve) => { require(['./UserGasList'], resolve) })
+  // 物联网表结算查询
+  Vue.component('report-data-query', (resolve) => { require(['./ReportDataQuery'], resolve) })
 }