manage-client 4.1.118 → 4.1.120

package/build/dev-server.js

@@ -1,145 +1,158 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-
-const app = express()
-const compiler = webpack(config)
-
-const server = 'http://36.134.191.191:31467/'
-const local = 'http://127.0.0.1:9026/'
-const proxyTable = {
-  '/rs/logic/exportfile': {
-    target: server
-  },
-  '/dataManage': {
-    target: server
-  },
-  // '/api/af-revenue/sql/': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
-  // '/api/af-revenue/report/': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
-  // '/api/af-revenue/logic': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
-  '/api': {
-    target: server
-  },
-  '/rs/sql/chargeQuery_by_gasproperties': {
-    target: server
-  },
-  '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: server
-  },
-  '/files': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: server
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: server
-  },
-  '/rs/logic/getSaleInitData': {
-    target: server
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: server
-  },
-  '/rs/path/getParams': {
-    target: server
-  },
-  '/rs/data': {
-    target: server
-  },
-  '/rs/license': {
-    target: server
-  },
-  '/rs/db': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/rs/config': {
-    target: server
-  },
-  '/rs/sql/getLicenseById': {
-    target: server
-  },
-  '/rs/report': {
-    target: server
-  },
-  '/rs/vue': {
-    target: server
-  },
-  '/rs/file': {
-    target: server
-  },
-  '/rs/sql/singleTable': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const 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) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-app.use(require('connect-history-api-fallback')())
-
-app.use(devMiddleware)
-
-app.use(hotMiddleware)
-
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(8015, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8015')
-})
+const express = require('express')
+const webpack = require('webpack')
+const config = require('./webpack.dev.conf')
+const proxyMiddleware = require('http-proxy-middleware')
+
+const app = express()
+const compiler = webpack(config)
+
+const server = 'https://yc.aofengcloud.com:31467'
+const local = 'http://127.0.0.1:9026/'
+const proxyTable = {
+  '/dataManage': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  // ... existing code ...
+  '/api': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/files': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/logic/getSaleInitData': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/path/getParams': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/data': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/license': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/db': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/excel': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/config': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/sql/getLicenseById': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/report': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/vue': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/file': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs/sql/singleTable': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
+  '/rs': {
+    target: server,
+    changeOrigin: true,
+    secure: false
+  }
+}
+const devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+const 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) {
+  let options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+app.use(require('connect-history-api-fallback')())
+
+app.use(devMiddleware)
+
+app.use(hotMiddleware)
+
+app.use('/static', express.static('./static'))
+
+module.exports = app.listen(8015, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8015')
+})

package/package.json

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

package/src/filiale/yuncheng/ChangeMeterQuery.vue

@@ -194,6 +194,11 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_defendcard"
                          condition="f_defendcard = '{}'" placeholder='防盗卡号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">防盗卡号2</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_defendcard_two"
+                         condition="f_defendcard_two = '{}'" placeholder='防盗卡号2'>
+                </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_serial_number"
@@ -257,6 +262,9 @@
                 <th>
                   <nobr>防盗卡号</nobr>
                 </th>
+                <th>
+                  <nobr>防盗卡号2</nobr>
+                </th>
                 <th>
                   <nobr>旧气表品牌</nobr>
                 </th>
@@ -360,6 +368,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_defendcard}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_defendcard_two}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
               </td>

package/src/filiale/yuncheng/LostContactAnalysisList.vue

@@ -95,7 +95,7 @@
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">气表型号</label>
-              <v-select v-if="$parent.$parent.styles"
+              <v-select
                         placeholder='气表型号'
                         :value.sync="model.f_meter_style"
                         v-model="model.f_meter_style"
@@ -103,14 +103,6 @@
                         close-on-select
                         condition="f_meter_style='{}'">
               </v-select>
-              <v-select v-if="!$parent.$parent.styles"
-                        placeholder='气表型号'
-                        :value.sync="model.f_meter_style"
-                        v-model="model.f_meter_style"
-                        :options='$parent.$parent.Warningstyles'
-                        close-on-select
-                        condition="f_meter_style='{}'">
-              </v-select>
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">用户状态</label>
@@ -452,10 +444,9 @@
         WarningType: [
           {label: '全部', value: ''}
         ],
-        Warningstyles: [
+        Warningstyle: [
           {label: '全部', value: ''}
         ],
-        styles:false,
         filename: '',
         orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
@@ -478,15 +469,22 @@
     ready() {
       readySomething(this)
       this.getMeterTypeAndBrand('f_meter_brand', '1=1')
+      this.getMeterTypeAndBrand('f_meter_style', `1=1`)
     },
     methods: {
       getMeterType() {
         this.Warningstyle = [{label: '全部', value: ''}]
-        this.styles = false
         let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
+        if (!f_meter_brand || f_meter_brand == ''){
+          this.getMeterTypeAndBrand('f_meter_style', `1=1`)
+          return
+        }
         this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
       },
       getMeterTypeAndBrand(groupname, condition) {
+        this.Warningstyle= [
+          {label: '全部', value: ''}
+        ],
         condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
         let self = this
         let load = new HttpResetClass()
@@ -504,9 +502,6 @@
               //气表品牌
               // self.WarningType.push(dr)
             } else if (groupname == 'f_meter_style') {
-              self.Warningstyle= [
-                {label: '全部', value: ''}
-              ],
               self.$refs.paged.$refs.cri.model.f_meter_style=''
               let dr = {}
               dr.label = res.data[i].f_meter_style
@@ -515,17 +510,24 @@
               self.Warningstyle.push(dr)
             }
           }
-          if (self.Warningstyle.length > 1) {
-            self.showMeterStyle()
-          }
         })
 
       },
-      showMeterStyle() {
-        this.styles = true
-      },
       userTypeChange () {
         this.gasproperties=[{label: '全部', value: ''}]
+        let userType = this.$refs.paged.$refs.cri.model.f_user_type
+        if (!userType || userType == '') {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          for (let usertype of this.usertypes) {
+            if (!usertype || usertype.value == ''){
+              continue
+            }
+            let res = this.$appdata.getParam(usertype.value)
+            console.log('gasproperties', res)
+            this.gasproperties.push(...res)
+          }
+          return
+        }
         if(this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
 

package/src/filiale/yuncheng/MeterQuery.vue

@@ -223,6 +223,11 @@
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_defendcard"
                            condition="f_defendcard = '{}'" placeholder='防盗卡号'>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">防盗卡号2</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_defendcard_two"
+                           condition="f_defendcard_two = '{}'" placeholder='防盗卡号2'>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">阀门状态</label>
                     <v-select :value.sync="model.f_valve_state" v-model="model.f_valve_state"
@@ -309,6 +314,9 @@
                   <th>
                     <nobr>防盗卡号</nobr>
                   </th>
+                  <th>
+                    <nobr>防盗卡号2</nobr>
+                  </th>
                   <th>
                     <nobr>气价名称</nobr>
                   </th>
@@ -409,7 +417,9 @@
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_defendcard }}</nobr>
                 </td>
-
+                <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{ row.f_defendcard_two }}</nobr>
+                </td>
 
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_price_name }}</nobr>

package/src/filiale/yuncheng/UserLostContactAnalysis.vue

@@ -0,0 +1,726 @@
+<template>
+  <div class="flex-row" v-if="!showdetail">
+    <div id='app1' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
+      <criteria-paged :model="model" :pager='true' v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+                <!--<div class="form-group">-->
+                <!--<input @keyup.enter="search"   style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'-->
+                <!--condition="f_user_name = '{}'" v-next-el='userid' v-el:username-->
+                <!--:size="model.f_user_name ? model.f_user_name.length * 2 : 8">-->
+                <!--</div>-->
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                         v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
+                  >
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                         v-model="model.f_user_name" placeholder='客户名称'
+                         condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
+                  >
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户地址</label>
+                  <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_area"
+                         placeholder='地址'
+                         condition="f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
+                  >
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                  <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                         v-model="model.f_meternumber" placeholder='表号'
+                         condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                  >
+                </div>
+
+              <div style="float:right">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                              :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                              :header="$parent.$parent.other"
+                              sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getUserLoseQuery" template-name='用户失联查询'
+                              :choose-col="true"></export-excel>
+    <!--              <button class="button_export button_spacing" @click="$parent.$parent.SaveAsFile('lostuserlist')">导出</button>-->
+    <!--              <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
+    <!--              <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</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="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" for="dep" >部&emsp;&emsp;门</label>
+                <res-select id="dep" restype='department' style="width: 60%"
+                            is-mul="false"
+                            @res-select="$parent.$parent.getdep"
+                            :parentresid="$parent.$parent.depresid"
+                            :initresid='$parent.$parent.depid' >
+                </res-select>
+
+              </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">客户类型</label>
+              <v-select style="width:60%" id="f_user_type"
+                        v-model="model.f_user_type"
+                        placeholder='客户类型'
+                        @change="$parent.$parent.userTypeChange()"
+                        :value.sync="model.f_user_type"
+                        :options='$parent.$parent.usertypes'
+                        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 style="width:60%" id="f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        placeholder='用气性质'
+                        :value.sync="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select>
+              </v-select>
+            </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.WarningType'
+                @change="$parent.$parent.getMeterType"
+                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 v-if="$parent.$parent.styles"
+                        placeholder='气表型号'
+                        :value.sync="model.f_meter_style"
+                        v-model="model.f_meter_style"
+                        :options='$parent.$parent.Warningstyle'
+                        close-on-select
+                        condition="f_meter_style='{}'">
+              </v-select>
+              <v-select v-if="!$parent.$parent.styles"
+                        placeholder='气表型号'
+                        :value.sync="model.f_meter_style"
+                        v-model="model.f_meter_style"
+                        :options='$parent.$parent.Warningstyles'
+                        close-on-select
+                        condition="f_meter_style='{}'">
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户状态</label>
+              <v-select
+                placeholder='用户状态'
+                value-single
+                style="width:60%"
+                :value.sync="model.f_user_state"
+                v-model="model.f_user_state"
+                :options='$parent.$parent.userstate'
+                close-on-select condition="f_user_state ='{}'">
+              </v-select>
+            </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表具状态</label>
+                <v-select
+                  placeholder='表具状态'
+                  value-single
+                  style="width:60%"
+                  :value.sync="model.f_table_state"
+                  v-model="model.f_table_state"
+                  :options='$parent.$parent.tablestate'
+                  close-on-select condition="f_table_state ='{}'">
+                </v-select>
+              </div>
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker style="width:60%" id="startdate" placeholder="开始时间"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">结束时间</label>
+                <datepicker style="width:60%" id="enddate" placeholder="结束日期"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+              <label class="font_normal_body">失联天数&nbsp;</label>
+              <div class="row">
+                <input type="text" style="width:27%" class="input_search" v-model="model.SLday1"
+                       condition="SLday >= {} " placeholder="">
+                <label class="font_normal_body"> ≤ x ≤ </label>
+                <input type="text" style="width:27%" class="input_search" v-model="model.SLday2"
+                       condition="SLday <= {} " placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group ">
+              <label for="contain_newfile" class="font_normal_body">开户未上报</label>
+              <v-select id="contain_newfile"
+                        v-model="model.notappear"
+                        style="width:60%"
+                        :value.sync="model.notappear"
+                        :options='$parent.$parent.not_appear'
+                        :value-single="true"
+                        close-on-select>
+              </v-select>
+            </div>
+
+          </div>
+
+
+
+            <!--:top='40' :left='60' :right='40' :bottom='60'-->
+            <!--:thead='"<th>序号</th>\n"+-->
+            <!--"<th>档案编号</th>" +-->
+            <!--" <th>档案标识</th>"+-->
+            <!--"<th>客户名称</th>"+-->
+            <!--"<th>表号</th"+-->
+            <!--"<th>表具类型</th>"+-->
+            <!--"<th>客户类型</th>"+-->
+            <!--"<th>区域</th>"+-->
+            <!--"<th>小区</th>"+-->
+            <!--"<th>地址</th>"+-->
+            <!--"<th>用气气量</th>"+-->
+            <!--"<th>用气金额</th>"-->
+            <!--+"<th>用气价格</th>"-->
+            <!--+"<th>时间</th>"-->
+            <!--+"<th>所属机构</th>"'-->
+            <!--:fields='["$index+1","f_username","f_meternumber","f_usertype","f_save_money","f_operate_status","f_close_reason","f_area","f_districtname","f_address","id","yytdepa"]'>-->
+            <!--</print-table>-->
+            <!--<export-excel :data="{orderitem: 'lastinputdate desc', condition: '1=1'}"-->
+            <!--:field="{f_username: '客户名称', f_meternumber: '表号',f_usertype:'客户类型',f_save_money:'剩余金额',-->
+            <!--f_operate_status:'状态',f_close_reason:'关阀原因',f_area:'区域',f_districtname:'小区', f_address: '地址',id:'档案编号',yytdepa:'所属机构'}"-->
+            <!--sqlurl="api/af-revenue/sql/getUserGas"></export-excel>-->
+
+          </div>
+        </criteria>
+      <data-grid id="lostuserlist" :model="model" partial='list' v-ref:grid class="list_area table_sy">
+          <template partial='head'>
+          <tr>
+              <th style="text-align:center">
+                <nobr>序号</nobr>
+              </th>
+
+            <!--<th rowspan="2" style="text-align:center"><nobr>客户编号</nobr></th>-->
+
+              <th style="text-align:center">
+                <nobr>客户编号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户名称</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户地址</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户类型</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>用气性质</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>联系电话</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>系统金额</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>表号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>启用日期</nobr>
+              </th>
+
+              <th style="text-align:center" >
+                <nobr>初次上报日期</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>最后上报日期</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>最后表读数</nobr>
+              </th>
+
+              <th style="text-align:center" >
+                <nobr>失联天数</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>气表厂家</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>气表型号</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>用户状态</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>表具状态</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>组织机构</nobr>
+              </th>
+              <th style="text-align:center" >
+                <nobr>部门</nobr>
+              </th>
+          </tr>
+
+          </template>
+          <template partial='body'>
+            <td style="text-align:center">{{$index+1}}</td>
+          <!--<td style="text-align:center">{{row.f_userfiles_id}}</td>-->
+
+
+            <td style="text-align: center;"><nobr>
+              <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+            </nobr> </td>
+            <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
+            <td>
+              <nobr>{{row.f_address}}</nobr>
+            </td>
+            <td style="text-align:center">{{row.f_user_type}}</td>
+            <td style="text-align:center">{{row.f_gasproperties}}</td>
+            <td style="text-align:center">{{row.f_user_phone}}</td>
+            <td style="text-align:center">{{row.f_balance_amount}}</td>
+            <td style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_startuse_date}}</nobr></td>
+            <td style="text-align:center">
+              <nobr>{{row.initinsertdate}}</nobr>
+            </td> <td style="text-align:center">
+            <nobr>{{row.lastinsertdate}}</nobr>
+          </td>
+          <td style="text-align:center">{{row.f_meter_base}}</td>
+
+            <td style="text-align:center">
+              <nobr>{{row.slday}}</nobr>
+            </td>
+            <td style="text-align:center">{{row.f_meter_brand}}</td>
+            <td style="text-align:center">
+              <nobr>{{row.f_meter_style}}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_user_state}}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_table_state}}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_orgname}}</nobr>
+            </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_depname}}</nobr>
+            </td>
+          <!--<td style="text-align:center">{{row.new_days}}</td>-->
+          <!--<td style="text-align:center">{{row.f_state}}</td>-->
+
+          </template>
+      </data-grid>
+      </criteria-paged>
+
+    </div>
+<!--    <div class="flex-row" v-show="echarts" style="width: 100%;height: 90%;">-->
+<!--      <lost-contact-echarts :groupname="groupname[0]" :condition="condition"-->
+<!--                            :echarts="echarts"></lost-contact-echarts>-->
+<!--    </div>-->
+<!--&lt;!&ndash;  <div v-show="isActiveTotalForm" style="height: 40px;width: 100%;">&ndash;&gt;-->
+<!--&lt;!&ndash;    <button class="button_search button_spacing" @click="notShowTotalForm()">隐藏汇总</button>&ndash;&gt;-->
+<!--&lt;!&ndash;  </div>&ndash;&gt;-->
+<!--  <div class="span" v-show="isActiveTotalForm" style="width: 100%;height: 90%;">-->
+<!--    <lost-contact-eform :condition="condition"-->
+<!--                     ></lost-contact-eform>-->
+<!--  </div>-->
+  </div>
+  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import UserGasEcharts from '../../components/webmeter/DrillData/UserGasEcharts'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../Util'
+  let readySomething = async function (self) {
+
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    let year = new Date().getFullYear()
+    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.notappear='不包含'
+    self.$refs.paged.$refs.cri.model.SLday1=10
+    self.$refs.paged.$refs.cri.model.f_user_state='正常'
+    self.$refs.paged.$refs.cri.model.f_table_state='正常'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+  }
+  export default {
+    title: '失联分析',
+    props: ['data'],
+    components: {UserGasEcharts},
+
+    data() {
+      return {
+        model: new PagedList('api/af-revenue/sql/webmeter_getUserLoseQuery', 20 ,{
+          startDate: 'this.model.startDate',
+          endDate: 'this.model.endDate'
+        }),
+        getfield:{
+          "f_userinfo_code":"客户编号","f_user_name":"客户名称",
+          "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
+          "f_meternumber":"表号",
+          "f_user_phone":"联系电话",
+          "f_balance_amount":"系统余额",
+          "f_user_state":"用户状态",
+          "f_table_state":"表具状态",
+          "f_startuse_date":"启用日期",
+          "initinsertdate":"初次上报日期",
+          "lastinsertdate":"最后上报日期",
+          "f_meter_base":"最后表读数",
+          "slday":"失联天数",
+          "f_meter_brand":"气表厂家","f_orgname":"组织机构","f_depname":"部门"},
+        reportStr: null,
+        show: false,
+        showdetail:false,
+        rowdata:{},
+        criteriaShow:false,
+        outlets: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
+        depid: [],
+        operator: [],
+        gasproperties: [],
+        other: [],
+        sumsmodel: {},
+        filename: '',
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        org:[this.$login.f.orgid],
+        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid} `,
+        echarts: false,
+        searchshow: false,
+        isActiveTotalForm: false,
+        condition: '1=1',
+        groupname: ['max_days_type'],
+        getgroupname: [
+          {label: '客户类型', value: 'f_user_type'},
+          {label: '用气性质', value: 'f_gasproperties'},
+          {label: '分公司', value: 'f_orgname'},
+          {label: '最长失联天数', value: 'max_days_type'},
+        ]
+      }
+    },
+    ready() {
+      readySomething(this)
+      this.getMeterTypeAndBrand('f_meter_brand', '1=1')
+    },
+
+    methods: {
+      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 ? this.$refs.paged.$refs.cri.model.f_user_type[0] : '')
+        }
+        else{
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      getotherfooter() {
+        this.other = [];
+
+        let firstLine = [`导出时间: ${this.$login.toStandardTimeString()}`];
+
+
+        let secondLine = [
+          `开始时间: ${this.$refs.paged.$refs.cri.model.startDate}`,
+          `结束时间: ${this.$refs.paged.$refs.cri.model.endDate}`
+        ];
+
+        this.other.push(firstLine);
+        this.other.push(secondLine);
+
+        console.log('Header Data:', this.other);
+      },
+      getMeterType() {
+        this.Warningstyle = [{label: '全部', value: ''}]
+        this.styles = false
+        let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
+        this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
+      },
+      getMeterTypeAndBrand(groupname, condition) {
+        condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
+        let self = this
+        let load = new HttpResetClass()
+        load.load('POST', 'api/af-revenue/sql/getMeterStyleAndBrand1', {
+          data: {
+            condition: condition,
+            groupname: groupname
+          }
+        }, {warnMsg: null, resolveMsg: null}).then((res) => {
+          for (let i = 0; i < res.data.length; i++) {
+            if (groupname == 'f_meter_brand') {
+              let dr = {}
+              dr.label = res.data[i].f_meter_brand
+              dr.value = res.data[i].f_meter_brand
+              //气表品牌
+              // self.WarningType.push(dr)
+            } else if (groupname == 'f_meter_style') {
+              self.Warningstyle= [
+                {label: '全部', value: ''}
+              ],
+               self.$refs.paged.$refs.cri.model.f_meter_style=''
+              let dr = {}
+              dr.label = res.data[i].f_meter_style
+              dr.value = res.data[i].f_meter_style
+              //气表类型
+              self.Warningstyle.push(dr)
+            }
+          }
+          if (self.Warningstyle.length > 1) {
+            self.showMeterStyle()
+          }
+        })
+
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.showdetail=true
+      },
+      cancel() {
+        this.showdetail = false
+      },
+      clickshow() {
+        this.searchshow = !this.searchshow
+      },
+      search(args) {
+        this.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
+        args.condition = this.condition
+        if(this.$refs.paged.$refs.cri.model.notappear) {
+          if (this.$refs.paged.$refs.cri.model.notappear === '不包含') {
+            args.condition = args.condition + " and initinsertdate <> '开户未上报'"
+          }
+        }
+        this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        if (this.endDate == '' || this.startDate == '') {
+          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        }
+        this.model.search(args.condition, args.model)
+      },
+      getorg(obj) {
+        if (obj.resids.length > 0) {
+          this.depresid = obj.resids
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
+        } else {
+          this.depresid = obj.resids
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
+        }
+        console.log(this.orgCondtionStr);
+      },
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        }
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
+
+      // SaveAsFile(str) {
+      //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
+      //     if (res === 'confirm') {
+      //       let style = '<style>' +
+      //         'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
+      //       let strHtml = style + document.getElementById(str).innerHTML;
+      //       console.log(strHtml);
+      //       let LODOP = getLodop();
+      //       LODOP.PRINT_INIT('');
+      //       LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
+      //       LODOP.SAVE_TO_FILE('失联分析.xls')
+      //     }
+      //   })
+      // },
+      clearmsg() {
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      close() {
+        this.show = false
+      },
+      initParams () {
+        let arr = []
+        this.$MagGetSaleParam.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.WarningType = [{label: '全部', value: ''}, ...arr]
+      },
+      // 显示柱状图
+      showEcharts() {
+        this.echarts = true
+        this.isActiveTotalForm = false
+      },
+      notShowTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 不显示柱状图
+      notShowEcharts() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 显示汇总数据表格
+      showTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = true
+      }
+    },
+    watch: {
+      'data'(val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+    },
+    computed: {
+      // usertypes () {
+      //   return this.$appdate.getParams("客户类型")
+      // },
+      getCondition() {
+        let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
+        if(this.$refs.paged.$refs.cri.model.notappear) {
+          if (this.$refs.paged.$refs.cri.model.notappear === '不包含') {
+            condition = condition + " and initinsertdate <> '开户未上报'"
+          }
+        }
+        return {
+            condition: condition  ,
+            startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
+            endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+        }
+      },
+      usertypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      Gasproperties() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      f_outlets() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('网点查询用')]
+      },
+      valveStatus() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      not_appear(){
+        return [{label: '包含', value: '包含'},{label: '不包含', value: '不包含'} ]
+      },
+      getstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('最新状态')]
+      },
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
+      },
+      tablestate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      }
+    }
+  }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .mystyle {
+    float: right;
+    padding-right: 10%;
+  }
+
+  .mystyle1 {
+    padding-top: 10px;
+
+  }
+
+  .mystyle2 {
+    width: 100%;
+    height: 35px;
+    /*background: #00A3F0;*/
+    padding-left: 15px;
+    float: left;
+  }
+
+  .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/yuncheng/config/exportConfig.js

@@ -149,6 +149,7 @@ export default {
     'f_meternumber': '表号',
     'f_card_id': '卡号',
     'f_defendcard': '防盗卡号',
+    'f_defendcard_two': '防盗卡号2',
     'f_price_name': '气价名称',
     'value': '气价详情',
     'f_meter_brand': '气表品牌',
@@ -762,6 +763,7 @@ export default {
     'f_meternumber_old': '旧表号',
     'f_meternumber': '新表号',
     'f_defendcard': '防盗卡号',
+    'f_defendcard_two': '防盗卡号2',
     'f_meter_brand_old': '旧气表品牌',
     'f_meter_brand': '新气表品牌',
     'f_using_base_old': '旧表底数',

package/src/filiale/yuncheng/sale.js

@@ -40,4 +40,8 @@ export default function () {
   Vue.component('fmy-gas-device-query', (resolve) => {
     require(['./FmyGasDeviceQuery'], resolve)
   })
+  // 用户失联
+  Vue.component('user-lost-contact-analysis', (resolve) => {
+    require(['./UserLostContactAnalysis'], resolve)
+  })
 }

package/src/main.js

@@ -6,8 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/xinjiangdexin/sale'
- // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
+import ShanXianSaleManage from './filiale/yuncheng/sale'
+import ShanXianwebSaleManage from './filiale/yuncheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -51,7 +51,7 @@ ManageHome()
 newmanage()
 ShanXianSaleManage()
 reportManage()
-// ShanXianSaleManage()
+ShanXianwebSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')