manage-client 3.3.210 → 3.3.211-by

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

@@ -148,6 +148,7 @@ export default {
     'f_gasproperties': '用气性质',
     'f_meternumber': '表号',
     'f_card_id': '卡号',
+    'f_defendcard': '防盗卡号',
     'f_price_name': '气价名称',
     'value': '气价详情',
     'f_meter_brand': '气表品牌',
@@ -158,6 +159,7 @@ export default {
     'f_input_date': '建表时间',
     'f_table_state': '气表状态',
     'isbgl': '是否壁挂炉',
+    'f_valve_state': '阀门状态',
     'f_networkvalve': '自动阀控'
   },
   ResidentialQuery: {
@@ -752,9 +754,11 @@ export default {
     'f_changemeter_fee': '换表费',
     'f_meternumber_old': '旧表号',
     'f_meternumber': '新表号',
+    'f_defendcard': '防盗卡号',
     'f_meter_brand_old': '旧气表品牌',
     'f_meter_brand': '新气表品牌',
     'f_using_base_old': '旧表底数',
+    'f_initial_base_new': '新表底数',
     'f_total_oldgasfee': '旧表累购',
     'f_remanent_gas': '补气量',
     'f_remanent_money': '补气金额',

package/src/filiale/yuncheng/sale.js

@@ -16,4 +16,8 @@ export default function () {
   Vue.component('equipment-query', (resolve) => {
     require(['./DeviceQuery'], resolve)
   })
+  // 表具查询
+  Vue.component('meter-query', (resolve) => {
+    require(['./MeterQuery'], resolve)
+  })
 }

package/src/main.js

@@ -1,68 +1,76 @@
-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 ShanXianSaleManage from './filiale/meihekou/sale'
-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()
-ShanXianSaleManage()
-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 FilialeSaleManage from './filiale/bayan/sale'
+import webmeterManage from './webmeterManage'
+import FilialeWebmeterManage from './filiale/bayan/webmeterManage'
+// import reportManage from './reportManage'
+// import FilialeReportManage from './filiale/wenxi/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'
+
+// // 开启 nginx 加密
+// Vue.mmType = 'nginx'
+// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+//
+// 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()
+// FilialeSaleManage()
+webmeterManage()
+FilialeWebmeterManage()
+// ManageHome()
+// newmanage()
+// reportManage()
+// FilialeReportManage()
+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/plugins/LodopFuncs.js

@@ -1,124 +1,159 @@
-var CreatedOKLodop7766=null;
-
-//====判断是否需要安装CLodop云打印服务器:====
-function needCLodop(){
-  // return false;
-    try{
-	var ua=navigator.userAgent;
-	if (ua.match(/Windows\sPhone/i) !=null) return true;
-	if (ua.match(/iPhone|iPod/i) != null) return true;
-	if (ua.match(/Android/i) != null) return true;
-	if (ua.match(/Edge\D?\d+/i) != null) return true;
-	if (ua.match(/QQBrowser/i) != null) return false;
-	var verTrident=ua.match(/Trident\D?\d+/i);
-	var verIE=ua.match(/MSIE\D?\d+/i);
-	var verOPR=ua.match(/OPR\D?\d+/i);
-	var verFF=ua.match(/Firefox\D?\d+/i);
-	var x64=ua.match(/x64/i);
-	if ((verTrident==null)&&(verIE==null)&&(x64!==null))
-		return true; else
-	if ( verFF !== null) {
-		verFF = verFF[0].match(/\d+/);
-		if ( verFF[0] >= 42 ) return true;
-	} else
-	if ( verOPR !== null) {
-		verOPR = verOPR[0].match(/\d+/);
-		if ( verOPR[0] >= 32 ) return true;
-	} else
-	if ((verTrident==null)&&(verIE==null)) {
-		var verChrome=ua.match(/Chrome\D?\d+/i);
-		if ( verChrome !== null ) {
-			verChrome = verChrome[0].match(/\d+/);
-			if (verChrome[0]>=42) return true;
-		};
-	};
-        return false;
-    } catch(err) {return true;};
-};
-
-//====页面引用CLodop云打印必须的JS文件：====
-if (needCLodop()) {
-	var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
-	var oscript = document.createElement("script");
-	//让本机浏览器打印(更优先)：
-	oscript = document.createElement("script");
-	oscript.src ="http://localhost:8008/CLodopfuncs.js?priority=1";
-	head.insertBefore( oscript,head.firstChild );
-	//本机浏览器的后补端口8001：
-	// oscript = document.createElement("script");
-	// oscript.src ="http://localhost:8001/CLodopfuncs.js?priority=2";
-	// head.insertBefore( oscript,head.firstChild );
-};
-
-//====获取LODOP对象的主过程：====
-function getLodop(oOBJECT,oEMBED){
-    var strHtmInstall="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
-    var strHtmUpdate="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>";
-    var strHtm64_Install="<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>";
-    var strHtm64_Update="<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>";
-    var strHtmFireFox="<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>";
-    var strHtmChrome="<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>";
-    var strCLodopInstall="<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>";
-    var strCLodopUpdate="<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>";
-    var LODOP;
-    try{
-        var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
-        if (needCLodop()) {
-            try{ LODOP=getCLodop();} catch(err) {};
-	    if (!LODOP && document.readyState!=="complete") {alert("C-Lodop没准备好，请稍后再试！"); return;};
-            if (!LODOP) {
-		 if (isIE) document.write(strCLodopInstall); else
-		 document.documentElement.innerHTML=strCLodopInstall+document.documentElement.innerHTML;
-                 return;
-            } else {
-
-	         if (CLODOP.CVERSION<"2.0.6.2") {
-			if (isIE) document.write(strCLodopUpdate); else
-			document.documentElement.innerHTML=strCLodopUpdate+document.documentElement.innerHTML;
-		 };
-		 if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED);
-		 if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT);
-	    };
-        } else {
-            var is64IE  = isIE && (navigator.userAgent.indexOf('x64')>=0);
-            //=====如果页面有Lodop就直接使用，没有则新建:==========
-            if (oOBJECT!=undefined || oEMBED!=undefined) {
-                if (isIE) LODOP=oOBJECT; else  LODOP=oEMBED;
-            } else if (CreatedOKLodop7766==null){
-                LODOP=document.createElement("object");
-                LODOP.setAttribute("width",0);
-                LODOP.setAttribute("height",0);
-                LODOP.setAttribute("style","position:absolute;left:0px;top:-100px;width:0px;height:0px;");
-                if (isIE) LODOP.setAttribute("classid","clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
-                else LODOP.setAttribute("type","application/x-print-lodop");
-                document.documentElement.appendChild(LODOP);
-                CreatedOKLodop7766=LODOP;
-             } else LODOP=CreatedOKLodop7766;
-            //=====Lodop插件未安装时提示下载地址:==========
-            if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) {
-                 if (navigator.userAgent.indexOf('Chrome')>=0)
-                     document.documentElement.innerHTML=strHtmChrome+document.documentElement.innerHTML;
-                 if (navigator.userAgent.indexOf('Firefox')>=0)
-                     document.documentElement.innerHTML=strHtmFireFox+document.documentElement.innerHTML;
-                 if (is64IE) document.write(strHtm64_Install); else
-                 if (isIE)   document.write(strHtmInstall);    else
-                     document.documentElement.innerHTML=strHtmInstall+document.documentElement.innerHTML;
-                 return LODOP;
-            };
-        };
-        if (LODOP.VERSION<"6.2.0.3") {
-            if (needCLodop())
-            document.documentElement.innerHTML=strCLodopUpdate+document.documentElement.innerHTML; else
-            if (is64IE) document.write(strHtm64_Update); else
-            if (isIE) document.write(strHtmUpdate); else
-            document.documentElement.innerHTML=strHtmUpdate+document.documentElement.innerHTML;
-            return LODOP;
-        };
-        //===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
-        LODOP.SET_LICENSES("西安奥枫软件有限公司","552C41D5AB0D146FCF77D05CD8AA15A1","","");
-        //===========================================================
-        return LODOP;
-    } catch(err) {alert("getLodop出错:"+err);};
-};
-
-export default getLodop
+var CreatedOKLodop7766 = null
+
+// ====判断是否需要安装CLodop云打印服务器:====
+function needCLodop () {
+  // return false;
+  try {
+    // 看是什么浏览器
+    var ua = navigator.userAgent
+    // windows，安装
+    if (ua.match(/Windows\sPhone/i) != null) return true
+    // iPhone, 安装
+    if (ua.match(/iPhone|iPod/i) != null) return true
+    // Android, 安装
+    if (ua.match(/Android/i) != null) return true
+    // Edge，安装
+    if (ua.match(/Edge\D?\d+/i) != null) return true
+    // QQ，不安装
+    if (ua.match(/QQBrowser/i) != null) return false
+
+    var verTrident = ua.match(/Trident\D?\d+/i)
+    var verIE = ua.match(/MSIE\D?\d+/i)
+    var verOPR = ua.match(/OPR\D?\d+/i)
+    var verFF = ua.match(/Firefox\D?\d+/i)
+    var x64 = ua.match(/x64/i)
+    if ((verTrident == null) && (verIE == null) && (x64 !== null)) {
+      return true
+    } else if (verFF !== null) {
+      verFF = verFF[0].match(/\d+/)
+      if (verFF[0] >= 42) return true
+    } else if (verOPR !== null) {
+      verOPR = verOPR[0].match(/\d+/)
+      if (verOPR[0] >= 32) return true
+    } else if ((verTrident == null) && (verIE == null)) {
+      var verChrome = ua.match(/Chrome\D?\d+/i)
+      if (verChrome !== null) {
+        verChrome = verChrome[0].match(/\d+/)
+        if (verChrome[0] >= 42) return true
+      }
+    }
+    return false
+  } catch (err) {
+    return true
+  }
+}
+
+// ====页面引用CLodop云打印必须的JS文件：====
+if (needCLodop()) {
+  var head = document.head || document.getElementsByTagName('head')[0] || document.documentElement
+  var oscript = document.createElement('script')
+  // 让本机浏览器打印(更优先)：
+  oscript.src = 'http://localhost:18000/CLodopfuncs.js?priority=1'
+  head.insertBefore(oscript, head.firstChild)
+}
+
+// ====获取LODOP对象的主过程：====
+function getLodop (oOBJECT, oEMBED) {
+  // 显示提示用的内容
+  var strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  var strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  var strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
+  var strHtm64_Update = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
+  var strHtmFireFox = "<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>"
+  var strHtmChrome = "<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>"
+  var strCLodopInstall = "<br><font color='#FF00FF'>CLodop云打印服务(localhost本地)未安装启动!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行安装</a>,安装后请刷新页面。</font>"
+  var strCLodopUpdate = "<br><font color='#FF00FF'>CLodop云打印服务需升级!点击这里<a href='CLodopPrint_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
+
+  var LODOP
+  try {
+    var isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
+    if (needCLodop()) {
+      try {
+        // 调用脚本中的获取打印对象
+        LODOP = getCLodop()
+      } catch (err) {
+      }
+      // 如果没找到打印控件
+      if (!LODOP && document.readyState !== 'complete') {
+        alert('C-Lodop没准备好，请稍后再试！')
+        return
+      }
+      if (!LODOP) {
+        if (isIE) {
+          // document.write(strCLodopInstall)
+          if(confirm('CLodop云打印服务(localhost本地)未安装启动!你确定要安装吗？\n(点击确定进行安装，安装后请刷新页面)')){
+            window.open('download/CLodop_Setup_for_Win32NT.exe')
+          }
+        }
+        else {
+          // document.documentElement.innerHTML = strCLodopInstall + document.documentElement.innerHTML
+          if(confirm('CLodop云打印服务(localhost本地)未安装启动!你确定要安装吗？\n(点击确定进行安装，安装后请刷新页面)')){
+            window.open('download/CLodop_Setup_for_Win32NT.exe')
+          }
+        }
+        return
+      } else { // 找到后的处理
+        if (CLODOP.CVERSION < '2.0.6.2') {
+          if (isIE) document.write(strCLodopUpdate)
+          else {
+            document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
+          }
+        }
+        if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
+        if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
+      }
+    } else { // 非云服务
+      var is64IE = isIE && (navigator.userAgent.indexOf('x64') >= 0)
+      // =====如果页面有Lodop就直接使用，没有则新建:==========
+      if (oOBJECT !== undefined || oEMBED !== undefined) {
+        if (isIE) LODOP = oOBJECT
+        else LODOP = oEMBED
+      } else if (CreatedOKLodop7766 == null) {
+        LODOP = document.createElement('object')
+        LODOP.setAttribute('width', 0)
+        LODOP.setAttribute('height', 0)
+        LODOP.setAttribute('style', 'position:absolute;left:0px;top:-100px;width:0px;height:0px;')
+        if (isIE) LODOP.setAttribute('classid', 'clsid:2105C259-1E0C-4534-8141-A753534CB4CA')
+        else LODOP.setAttribute('type', 'application/x-print-lodop')
+        document.documentElement.appendChild(LODOP)
+        CreatedOKLodop7766 = LODOP
+      } else LODOP = CreatedOKLodop7766
+      // =====Lodop插件未安装时提示下载地址:==========
+      if ((LODOP == null) || (typeof (LODOP.VERSION) === 'undefined')) {
+        if (navigator.userAgent.indexOf('Chrome') >= 0) {
+          document.documentElement.innerHTML = strHtmChrome + document.documentElement.innerHTML
+        }
+        if (navigator.userAgent.indexOf('Firefox') >= 0) {
+          document.documentElement.innerHTML = strHtmFireFox + document.documentElement.innerHTML
+        }
+        if (is64IE) document.write(strHtm64_Install)
+        else if (isIE) document.write(strHtmInstall)
+        else {
+          document.documentElement.innerHTML = strHtmInstall + document.documentElement.innerHTML
+        }
+        return LODOP
+      }
+    }
+
+    // 检查版本
+    if (LODOP.VERSION < '6.2.0.3') {
+      if (needCLodop()) {
+        document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
+      } else if (is64IE) {
+        document.write(strHtm64_Update)
+      } else if (isIE) {
+        document.write(strHtmUpdate)
+      } else {
+        document.documentElement.innerHTML = strHtmUpdate + document.documentElement.innerHTML
+      }
+      return LODOP
+    }
+    // ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
+    LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
+    return LODOP
+  } catch (err) {
+    alert('getLodop出错:' + err)
+  }
+}
+
+export default getLodop

package/src/reportManage.js

@@ -586,6 +586,11 @@ export default function () {
   Vue.component('bus-summaryes', (resolve) => {
     require(['./components/SellReport/BusSummaryes'], resolve)
   })
+
+  // 报表展示组件(阳春日结账报表)
+  Vue.component('yc-bus-summaryes', (resolve) => {
+    require(['./components/SellReport/yangchun/YcBusSummaryes'], resolve)
+  })
   // 乌海公服报表
   Vue.component('gf-report-wh', (resolve) => {
     require(['./components/SellReport/GFReportWH'], resolve)

package/src/saleManage.js

@@ -686,4 +686,6 @@ export default function () {
   Vue.component('user-open-echarts', (resolve) => { require(['./components/BasisEcharts/businessQuery/userOpenEcharts'], resolve) })
 
   Vue.component('web-meter-user-month-query', (resolve) => { require(['./components/sale/businessquery/WebMeterMonthUserGasQuery'], resolve) })
+  // 打印
+  Vue.component('print-table', (resolve) => { require(['./components/sale/common/PrintTableManage'], resolve) })
 }