manage-client 3.2.275 → 3.2.277

package/build/dev-server.js

@@ -7,6 +7,7 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
+
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
@@ -18,7 +19,7 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://121.36.106.17:8400'
 // var bendi = 'http://119.187.112.234:8400/'
 var wode = 'http://127.0.0.1:8084'
 // 192.168.

package/package.json

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

package/src/components/webmeter/DrillData/GetNoMetereadData.vue

@@ -145,6 +145,9 @@
             <th style="text-align:center">
               <nobr>客户名称</nobr>
             </th>
+            <th style="text-align:center">
+              <nobr>客户电话</nobr>
+            </th>
             <th style="text-align:center">
               <nobr>客户地址</nobr>
             </th>
@@ -178,6 +181,7 @@
             <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 style="text-align:center"><nobr>{{row.f_user_phone}}</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>

package/src/filiale/kelai/exportConfig.js

@@ -1058,5 +1058,10 @@ export default{
     'f_collection': '收款', 'f_payment': '付款方式', 'f_operate_date': '收费日期', 'f_state': '状态',
     'f_orgname': '所属机构', 'f_depname': '部门', 'f_operator': '操作人'
   },
+  feimin_style: {
+    'f_userinfo_code': '用户编号', 'f_olduserinfo_code': '档案编号',
+    'f_user_name': '用户名称', 'f_price': '单价', 'zgougas': '总购气量汇总', 'gougas': '本月购气量汇总',
+    'bugas': '补气汇总', 'yugas': '表余量汇总', 'yonggas': '用气量汇总'
+  }
 }
 

package/src/filiale/kelai/feimin_style.vue

@@ -81,9 +81,6 @@
                 <th>
                   <nobr>档案编号</nobr>
                 </th>
-                <th>
-                  <nobr>用户名称</nobr>
-                </th>
                 <th>
                   <nobr>单价</nobr>
                 </th>
@@ -297,12 +294,12 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch(args) {
-      let orgcondition = ' uf.f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
       if (this.f_depid[0]) {
-        orgcondition += " and uf.f_depid in("+this.f_depid.toString()+')'
+        orgcondition += " and f_depid in("+this.f_depid.toString()+')'
       }
       if(this.f_operatorid[0]) {
-        orgcondition += ' and ts2.f_operatorid in (' + this.f_operatorid + ')'
+        orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
       }
       this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
       this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)

package/src/filiale/ningjin/ChargeQuery.vue

@@ -873,7 +873,7 @@
 
         footer:[],
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_address', 'f_user_type', 'f_pregas', 'f_orgname', 'f_operator', 'f_operate_date', 'f_gasproperties', 'fee']
         },
         //排序
         orderitem:'',

package/src/filiale/wenxi/ChargeQuery.vue

@@ -420,12 +420,12 @@
                 <th>
                   <nobr>开票时间</nobr>
                 </th>
-                <th>
-                  <nobr>累计写卡气量</nobr>
-                </th>
-                <th>
-                  <nobr>实际写卡金额</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>累计写卡气量</nobr>-->
+<!--                </th>-->
+<!--                <th>-->
+<!--                  <nobr>实际写卡金额</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>冲正人</nobr>
                 </th>
@@ -631,12 +631,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_invoice_date}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_write_totalgas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_write_money}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_write_totalgas}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_write_money}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_corr_operator}}</nobr>
               </td>

package/src/filiale/wenxi/RecordInfoQuery.vue

@@ -76,11 +76,11 @@
                     <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_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_alarm_code"-->
+<!--                           condition="f_alarm_code like '%{}%'" placeholder='报警器编码'>-->
+<!--                  </div>-->
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">气表分类</label>
                     <v-select :value.sync="model.f_meter_classify"
@@ -187,24 +187,24 @@
                               condition="f_position = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">是否有自闭阀</label>
-                    <v-select :value.sync="model.s_devices_type" v-model="model.s_devices_type"
-                              :options='$parent.$parent.selfClosing' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">是否不锈钢波纹管</label>
-                    <v-select :value.sync="model.s_corrugated" v-model="model.s_corrugated"
-                              :options='$parent.$parent.corrugated' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">有无合同日期</label>
-                    <v-select :value.sync="model.s_contractdate" v-model="model.s_contractdate"
-                              :options='$parent.$parent.contractDate' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
+<!--                  <div class="col-sm-2 form-group">-->
+<!--                    <label class="font_normal_body">是否有自闭阀</label>-->
+<!--                    <v-select :value.sync="model.s_devices_type" v-model="model.s_devices_type"-->
+<!--                              :options='$parent.$parent.selfClosing' placeholder='请选择'-->
+<!--                              close-on-select></v-select>-->
+<!--                  </div>-->
+<!--                  <div class="col-sm-2 form-group">-->
+<!--                    <label class="font_normal_body">是否不锈钢波纹管</label>-->
+<!--                    <v-select :value.sync="model.s_corrugated" v-model="model.s_corrugated"-->
+<!--                              :options='$parent.$parent.corrugated' placeholder='请选择'-->
+<!--                              close-on-select></v-select>-->
+<!--                  </div>-->
+<!--                  <div class="col-sm-2 form-group">-->
+<!--                    <label class="font_normal_body">有无合同日期</label>-->
+<!--                    <v-select :value.sync="model.s_contractdate" v-model="model.s_contractdate"-->
+<!--                              :options='$parent.$parent.contractDate' placeholder='请选择'-->
+<!--                              close-on-select></v-select>-->
+<!--                  </div>-->
 
 
 
@@ -372,7 +372,7 @@
                     <data-order field="f_hand_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
                   </th>
                   <th><nobr>自动阀控</nobr></th>
-                  <th><nobr>阀门状态</nobr></th>
+<!--                  <th><nobr>阀门状态</nobr></th>-->
 
                   <th>
                     <!--<nobr>开户时间</nobr>-->
@@ -390,7 +390,7 @@
                   <th><nobr>备用电话</nobr></th>
                   <th><nobr>租户姓名</nobr></th>
                   <th><nobr>租户电话</nobr></th>
-                  <th><nobr>是否煤改气</nobr></th>
+<!--                  <th><nobr>是否煤改气</nobr></th>-->
 
                   <th><nobr>使用类型</nobr></th>
 
@@ -512,7 +512,7 @@
                 <!--自动阀控38-->
                 <td style="text-align: center;"><nobr>{{row.f_network_valve}}</nobr></td>
                 <!--阀门状态39-->
-                <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
+<!--                <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>-->
                 <!--开户时间40-->
                 <td style="text-align: center;"><nobr>{{row.f_open_date}}</nobr></td>
                 <!--证件类型41-->
@@ -530,7 +530,7 @@
                 <!--租户电话47-->
                 <td style="text-align: center;"><nobr>{{row.f_zuhu_phone}}</nobr></td>
                 <!--是否煤改气48-->
-                <td style="text-align: center;"><nobr>{{row.f_is_mgq}}</nobr></td>
+<!--                <td style="text-align: center;"><nobr>{{row.f_is_mgq}}</nobr></td>-->
                 <!--使用类型49-->
                 <td style="text-align: center;"><nobr>{{row.f_usetype}}</nobr></td>
                 <!--表具状态50-->

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", //地图工具条0
-    "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('kelai')
-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", //地图工具条0
+    "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 }
+})
+