manage-client 3.1.13 → 3.1.14-ls

package/src/filiale/liaoyuan/RecordInfoQuery.vue

@@ -25,7 +25,19 @@
                               condition="f_user_state = '{}'"
                               close-on-select></v-select>
                   </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_meternumber"
+                            condition="f_meternumber like '%{}%'" placeholder='气表表号'>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">使用类型</label>
+                    <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
+                              :options='$parent.$parent.useTypes' placeholder='请选择'
+                              style="width:60%"
+                              close-on-select
+                              condition="f_usetype = '{}'"></v-select>
+                  </div>
                   <div class="span" style = "float:right;">
                     <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
                     <read-card :is-single.sync="$parent.$parent.isSingleUser"  @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
@@ -50,59 +62,6 @@
 
                 <div class="row" v-show="$parent.$parent.criteriaShow">
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
-                  <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_phone"
-                            condition="f_user_phone 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_idnumber"
-                           condition="f_idnumber 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_people_num"
-                           condition="f_people_num = '{}'" 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_meternumber"
-                            condition="f_meternumber like '%{}%'" placeholder='气表表号'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">使用类型</label>
-                    <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
-                              :options='$parent.$parent.useTypes' placeholder='请选择'
-                              style="width:60%"
-                              close-on-select
-                              condition="f_usetype = '{}'"></v-select>
-                  </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_alarm_code"
-                           condition="f_alarm_code 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_taxpayer_id"
-                           condition="f_taxpayer_id 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_balance"
-                           condition="f_balance >= '{}'" placeholder="最小值">
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.balance2"
-                           condition="f_balance <= '{}'" 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_depname"
-                           condition="f_depname like '%{}%'" placeholder='建档部门'>
-                  </div>
                   <div class="col-sm-2 form-group" >
                     <label for="startDate" class="font_normal_body" title="建档开始日期">开始日期</label>
                     <datepicker id="startDate" placeholder="建档开始日期" style="width:60%"
@@ -640,7 +599,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>

package/src/filiale/liaoyuan/ReportList.vue

@@ -204,7 +204,7 @@
           </footer>
         </modal>
       </div>
-      <div  class="flex" v-if="show">
+      <div  class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/filiale/macheng/MeterQuery.vue

@@ -429,7 +429,7 @@
           <!--</footer>-->
           <!--</modal>-->
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div>

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -283,7 +283,7 @@
         <footer slot="modal-footer" class="modal-footer">
         </footer>
       </modal>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>

package/src/filiale/meihekou/ChargeQuery.vue

@@ -120,10 +120,10 @@
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
-                  <v-select :value.sync="model.f_payment"
+                  <v-select :value.sync="model.f_payment" multiple
                             v-model="model.f_payment"
                             :options='$parent.$parent.payment' placeholder='请选择'
-                            condition="f_payment = '{}'"
+                            condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -184,9 +184,9 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_type"
+                  <v-select :value.sync="model.f_meter_type" multiple
                             :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                            condition="f_meter_type = '{}'"
+                            condition="f_meter_type in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/filiale/meihekou/HandplanQuery.vue

@@ -641,7 +641,7 @@
         <footer slot="modal-footer" class="modal-footer">
         </footer>
       </modal>
-      <div class="flex" v-if="show">
+      <div class="basic-main" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/filiale/meihekou/RecordInfoQuery.vue

@@ -18,9 +18,8 @@
                             condition="f_user_name = '{}'" placeholder="客户名称">
                   </div>
                   <div class="col-sm-2 form-group" >
-                    <label class="font_normal_body" title="参数名称:用户状态">客户状态</label>
+                    <label class="font_normal_body">客户状态</label>
                     <v-select :value.sync="model.f_user_state"
-                              title="参数名称:用户状态"
                               v-model="model.f_user_state"
                               :options='$parent.$parent.userstates' placeholder='请选择'
                               condition="f_user_state = '{}'"
@@ -623,7 +622,7 @@
             </footer>
           </modal>
         </div>
-        <div class="flex" v-if="show">
+        <div class="basic-main" v-if="show">
           <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
         </div>
       </div></div></div>
@@ -795,6 +794,22 @@
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();
       },
+      // async  getaddress(){
+      //   console.log('开始获取小区')
+      //   let HttpReset = new HttpResetClass()
+      //   var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+      //     data: {
+      //       condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+      //     }
+      //   }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      //   console.log('小区',data)
+      //   let house = [{label: '全部', value: ''}]
+      //   for (let row of data.data){
+      //     console.log('开始保存小区')
+      //     house.push({label: row.f_residential_area, value: row.f_residential_area})
+      //   }
+      //   this.residentialArea = house
+      // },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
@@ -806,6 +821,7 @@
         this.show=true
       },
       selfSearch (args) {
+
         //抄表员查询条件
         this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
         if(this.inputtouPerson.length !== 0){
@@ -817,6 +833,8 @@
           //查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
+        //
+        debugger
         this.bookinputtorperson = this.$refs.paged.$refs.cri.model.f_book_inputtor;
         if(this.bookinputtorperson.length !== 0){
           let str = JSON.stringify(this.bookinputtorperson)

package/src/filiale/meihekou/sale.js

@@ -13,11 +13,7 @@ let specialComp = {
   // 综合档案信息查询
   'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
   // 欠费查询
-  'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用气分析汇总查询
-  'user-gas-eform': (resolve) => { require(['./UserGasEform'], resolve) },
+  'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/pingxiang/ChangeUserQuery.vue

@@ -147,7 +147,7 @@
                     </data-grid>
                 </criteria-paged>
             </div>
-          <div class="flex" v-if="show">
+          <div class="basic-main" v-if="show">
             <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
           </div>
         </div>

package/src/filiale/shaoguan/HandplanQuery.vue

@@ -626,7 +626,7 @@
         </footer>
       </modal>
     </div>
-    <div class="flex" v-if="show">
+    <div class="basic-main" v-if="show">
       <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">

package/src/filiale/shaoguan/errorHandplanQuery.vue

@@ -57,7 +57,7 @@
                   <button class="button_clear button_spacing"  @click="$parent.$parent.oneClikeImport()">一键导入</button>
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="changebattcherror" template-name='报错查询'
+                                sqlurl="rs/logic/exportfile" sql-name="battcherror" 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>

package/src/filiale/shaoguan/overDueQuery.vue

@@ -156,7 +156,7 @@
           </tr>
         </table>
       </div>
-      <div class="flex" v-if="showinfo">
+      <div class="basic-main" v-if="showinfo">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>

package/src/filiale/shaoguan/sale/businessquery/ChangeUserQuery.vue

@@ -165,7 +165,7 @@
                     </data-grid>
                 </criteria-paged>
             </div>
-          <div class="flex" v-if="show">
+          <div class="basic-main" v-if="show">
             <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
           </div>
         </div>

package/src/main.js

@@ -1,66 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-// import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-sale()
-ldap()
-system(false)
-saleManage('zhoukou')
-
-webmeterManage()
-ManageHome()
-// newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+sale()
+ldap()
+system(false)
+saleManage()
+
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+

package/src/newmanage.js

@@ -23,7 +23,7 @@ export default function () {
   )
   // ring-chart 柱状图
   Vue.component('bar-chart', (resolve) => {
-      require(['./components/qinhua/BarChart'], resolve)
+      require(['./components/BasisEcharts/BarChart'], resolve)
     }
   )
 
@@ -364,7 +364,7 @@ export default function () {
     require(['./components/qinhua/SafecheckRing'], resolve)
   })
   Vue.component('ring-sell', (resolve) => {
-    require(['./components/daping/Ring'], resolve)
+    require(['./components/qinhua/Ring'], resolve)
   })
   Vue.component('qinhua-map', (resolve) => {
     require(['./components/qinhua/qinHuaMap'], resolve)
@@ -376,7 +376,7 @@ export default function () {
     require(['./components/qinhua/SellEcharts'], resolve)
   })
   Vue.component('bar-chart-line', (resolve) => {
-    require(['./components/daping/BarChartLine'], resolve)
+    require(['./components/qinhua/BarChartLine'], resolve)
   })
   Vue.component('manage-main', (resolve) => {
     require(['./components/qinhua/ManageMain'], resolve)
@@ -460,40 +460,6 @@ export default function () {
 
 
 
-//  大屏
-  Vue.component('manage-main2', (resolve) => {
-    require(['./components/daping/ManageMain'], resolve)
-  })
-  Vue.component('scada', (resolve) => {
-    require(['./components/daping/Scada'], resolve)
-  })
-  Vue.component('qh-call-center', (resolve) => {
-    require(['./components/daping/CallCenter'], resolve)
-  })
-  Vue.component('qh-data-management', (resolve) => {
-    require(['./components/daping/DataManagement'], resolve)
-  })
-  Vue.component('qh-data-management1', (resolve) => {
-    require(['./components/daping/DataManagement1'], resolve)
-  })
-  Vue.component('qh-sell-bar-echarts', (resolve) => {
-    require(['./components/daping/SellBarEcharts'], resolve)
-  })
-  Vue.component('qh-data-statistics', (resolve) => {
-    require(['./components/daping/DataStatistics'], resolve)
-  })
-  Vue.component('qh-expire-meter', (resolve) => {
-    require(['./components/daping/ExpireMeter'], resolve)
-  })
-  Vue.component('qh-residents-security', (resolve) => {
-    require(['./components/daping/ResidentsSecurity'], resolve)
-  })
-  // Vue.component('qh-xian-map', (resolve) => {
-  //   require(['./components/daping/XianMap'], resolve)
-  // })
-  Vue.component('gmap', (resolve) => {
-    require(['./components/daping/GMap'], resolve)
-  })
 }
 
 

package/src/reportManage.js

@@ -428,6 +428,10 @@ export default function (filiale) {
   Vue.component('user-selling-gas', (resolve) => {
     require(['./components/SellReport/UserSellingGas'], resolve)
   })
+  // 机表抄表分项报表
+  Vue.component('genera-hand-report', (resolve) => {
+    require(['./components/handReport/GeneraHandReport'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/saleManage.js

@@ -30,10 +30,6 @@ export default function (filiale) {
   Vue.component('equipment-query', (resolve) => {
     require(['./components/sale/filesquery/DeviceQuery'], resolve)
   })
-  // 表具设备查询
-  Vue.component('price-change-query', (resolve) => {
-    require(['./components/sale/filesquery/PriceChangeQuery'], resolve)
-  })
   // 用户设备查询
   Vue.component('user-equipment-query', (resolve) => {
     require(['./components/sale/filesquery/UserDeviceQuery'], resolve)
@@ -476,11 +472,6 @@ export default function (filiale) {
   //销售量分类
   Vue.component('sales-gas-classification',(resolve) => { require(['./components/sale/businessquery/SalesGasClassification'], resolve)})
 
-  //气价变更查询
-  Vue.component('price-change',(resolve) => { require(['./components/sale/businessquery/PriceChange'], resolve)})
-
-  Vue.component('iot-state-query',(resolve) => { require(['./components/sale/businessquery/iotStateSearch/iotStateQuery.vue'], resolve)})
-
   // 分公司特殊页面注册替换
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/sale`).specialComp