manage-client 3.1.31 → 3.1.35

package/src/plugins/LodopFuncs.js

@@ -1,124 +1,124 @@
-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;
+	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

package/src/plugins/getAllInputtor.js

@@ -1,29 +1,29 @@
-import Vue from 'vue'
-
-let getAllInputtor ={
-  inputtors : [],
-  async init(){
-    let res = await Vue.resetpost('rs/sql/getAlluserRes', {
-      condition:" 1=1"
-    }, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
-    if(res.data){
-      getAllInputtor.inputtors = res.data;
-    }
-  },
-  getresinputtor(orgid){
-    let inputtors = []
-    if(getAllInputtor.inputtors.length>0){
-      let arr = getAllbatch.data.filter((res) => {
-        return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == 'orgid'
-      })
-      inputtors.push({label: "全部", value: ""})
-      arr.forEach((res) => {
-        inputtors.push({label: res.name, value: res.name})
-      })
-      getAllInputtor.inputtors = inputtors;
-    }
-    return getAllInputtor;
-  }
-
-}
-export default getAllInputtor
+import Vue from 'vue'
+
+let getAllInputtor ={
+  inputtors : [],
+  async init(){
+    let res = await Vue.resetpost('rs/sql/getAlluserRes', {
+      condition:" 1=1"
+    }, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+    if(res.data){
+      getAllInputtor.inputtors = res.data;
+    }
+  },
+  getresinputtor(orgid){
+    let inputtors = []
+    if(getAllInputtor.inputtors.length>0){
+      let arr = getAllbatch.data.filter((res) => {
+        return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == 'orgid'
+      })
+      inputtors.push({label: "全部", value: ""})
+      arr.forEach((res) => {
+        inputtors.push({label: res.name, value: res.name})
+      })
+      getAllInputtor.inputtors = inputtors;
+    }
+    return getAllInputtor;
+  }
+
+}
+export default getAllInputtor

package/src/reportManage.js

@@ -448,6 +448,10 @@ export default function (filiale) {
   Vue.component('market-month', (resolve) => {
     require(['./components/SellReport/MarketMonth'], resolve)
   })
+  // 财务报表(销售类型)
+  Vue.component('finance-sell-type', (resolve) => {
+    require(['./components/SellReport/FinanceSellType'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/safeCheck.js

@@ -1,63 +1,63 @@
-import Vue from 'vue'
-
-import echarts from 'echarts'
-import MagLoadParams from  './stores/MagLoadParams'
-import MagGetSaleParam from  './stores/MagGetSaleParams'
-
-
-export default function () {
-  Vue.prototype.$echarts = echarts
-
-  /** ****************************计划安检********************************************/
-
-  // 2019年月安检户数分布
-  Vue.component('check-family', (resolve) => {
-    require(['./components/safeCheck/planCheck/checkFamily'], resolve)
-  })
-  // 2019年概率况分布
-  Vue.component('chance-situation', (resolve) => {
-    require(['./components/safeCheck/planCheck/chanceSituation'], resolve)
-  })
-  // 2019年入户情况分布
-  Vue.component('in-family', (resolve) => {
-    require(['./components/safeCheck/planCheck/inFamily'], resolve)
-  })
-  // 2019年隐患结果处理情况
-  Vue.component('hidden-danger', (resolve) => {
-    require(['./components/safeCheck/planCheck/hidderDanger'], resolve)
-  })
-  //检查大屏分析
-  Vue.component('check-all', (resolve) => {
-    require(['./components/safeCheck/planCheck/checkAll'], resolve)
-  })
-
-
-  /** ****************************安检无计划结果分析********************************************/
-  //入户情况
-  Vue.component('into-fam', (resolve) => {
-    require(['./components/safeCheck/noPlanCheck/intoFam'], resolve)
-  })
-  //一级隐患情况
-  Vue.component('first-danger', (resolve) => {
-    require(['./components/safeCheck/noPlanCheck/firstDanger'], resolve)
-  })
-  //安检情况
-  Vue.component('check-situation', (resolve) => {
-    require(['./components/safeCheck/noPlanCheck/checkSituation'], resolve)
-  })
-
-  //安检员安检户数情况
-  Vue.component('checkman-situation', (resolve) => {
-    require(['./components/safecheck/noPlanCheck/checkmanSituation'], resolve)
-  })
-  //隐患明细分布情况
-  Vue.component('danger-distrubution', (resolve) => {
-    require(['./components/safeCheck/noPlanCheck/dangerDistrubution'], resolve)
-  })
-  //期间无计划安检结果分析
-  Vue.component('nocheck-all', (resolve) => {
-    require(['./components/safeCheck/noPlanCheck/noCheckAll'], resolve)
-  })
-
-
-}
+import Vue from 'vue'
+
+import echarts from 'echarts'
+import MagLoadParams from  './stores/MagLoadParams'
+import MagGetSaleParam from  './stores/MagGetSaleParams'
+
+
+export default function () {
+  Vue.prototype.$echarts = echarts
+
+  /** ****************************计划安检********************************************/
+
+  // 2019年月安检户数分布
+  Vue.component('check-family', (resolve) => {
+    require(['./components/safeCheck/planCheck/checkFamily'], resolve)
+  })
+  // 2019年概率况分布
+  Vue.component('chance-situation', (resolve) => {
+    require(['./components/safeCheck/planCheck/chanceSituation'], resolve)
+  })
+  // 2019年入户情况分布
+  Vue.component('in-family', (resolve) => {
+    require(['./components/safeCheck/planCheck/inFamily'], resolve)
+  })
+  // 2019年隐患结果处理情况
+  Vue.component('hidden-danger', (resolve) => {
+    require(['./components/safeCheck/planCheck/hidderDanger'], resolve)
+  })
+  //检查大屏分析
+  Vue.component('check-all', (resolve) => {
+    require(['./components/safeCheck/planCheck/checkAll'], resolve)
+  })
+
+
+  /** ****************************安检无计划结果分析********************************************/
+  //入户情况
+  Vue.component('into-fam', (resolve) => {
+    require(['./components/safeCheck/noPlanCheck/intoFam'], resolve)
+  })
+  //一级隐患情况
+  Vue.component('first-danger', (resolve) => {
+    require(['./components/safeCheck/noPlanCheck/firstDanger'], resolve)
+  })
+  //安检情况
+  Vue.component('check-situation', (resolve) => {
+    require(['./components/safeCheck/noPlanCheck/checkSituation'], resolve)
+  })
+
+  //安检员安检户数情况
+  Vue.component('checkman-situation', (resolve) => {
+    require(['./components/safecheck/noPlanCheck/checkmanSituation'], resolve)
+  })
+  //隐患明细分布情况
+  Vue.component('danger-distrubution', (resolve) => {
+    require(['./components/safeCheck/noPlanCheck/dangerDistrubution'], resolve)
+  })
+  //期间无计划安检结果分析
+  Vue.component('nocheck-all', (resolve) => {
+    require(['./components/safeCheck/noPlanCheck/noCheckAll'], resolve)
+  })
+
+
+}