From 4bced50ec8952971a86e8aceac4f7ec0a6e25afa Mon Sep 17 00:00:00 2001
From: zxf <zxf123456>
Date: Tue, 22 Nov 2022 14:55:55 +0800
Subject: [PATCH] 1

---
 .../com/hangxin/web/TickingAction.class       | Bin 9924 -> 9848 bytes
 build/classes/db/telaccount_sql.xml           |  11 +-
 build/classes/html/rush/accountadd.html       |   4 +
 .../classes/html/rush/rushtasklistdetail.html | 101 +++++++++++-------
 build/classes/html/rush/telaccount.html       |  30 +++++-
 build/classes/html/tick/shijidetail.html      |   1 +
 build/classes/rush/TaskAuthJob.class          | Bin 9650 -> 9650 bytes
 build/classes/rush/TelAccountAction.class     | Bin 5186 -> 6209 bytes
 .../WEB-INF/classes/db/telaccount_sql.xml     |  11 +-
 .../WEB-INF/classes/html/rush/accountadd.html |   4 +
 .../classes/html/rush/rushtasklistdetail.html | 101 +++++++++++-------
 .../WEB-INF/classes/html/rush/telaccount.html |  30 +++++-
 .../classes/html/tick/shijidetail.html        |   1 +
 .../WEB-INF/classes/rush/TaskAuthJob.class    | Bin 9650 -> 9650 bytes
 .../classes/rush/TelAccountAction.class       | Bin 5186 -> 6209 bytes
 .../artifacts/rushfee_Web_exploded/ptrun.ini  |   2 +-
 resource/db/telaccount_sql.xml                |  11 +-
 resource/html/rush/accountadd.html            |   4 +
 resource/html/rush/accountupdate.html         |  55 ++++++++++
 resource/html/rush/rushtasklistdetail.html    | 101 +++++++++++-------
 resource/html/rush/telaccount.html            |  30 +++++-
 src/rush/TaskAuthJob.java                     |   2 +-
 src/rush/TelAccountAction.java                |  28 +++++
 23 files changed, 378 insertions(+), 149 deletions(-)
 create mode 100644 resource/html/rush/accountupdate.html

diff --git a/build/classes/com/hangxin/web/TickingAction.class b/build/classes/com/hangxin/web/TickingAction.class
index 4e46db4ecd02f08ac5b4e2d3f07df145b1dd9cfb..3360b8f57487b12f8008317c3f2ee428190e4d7a 100644
GIT binary patch
delta 60
zcmX@&`@?5LtpMY@$#nujoXL9G1r@mp3ObuF30z@hWShKPsGn5_BsSShcnMR4`sB63
P(v!an3vEsmNfrVCy_^-Z

delta 79
zcmV-V0I>h~OvFvFeGmcXlYS6V0w5r>*$~tL0RfY)5|5KY6QlyLCzH7o8<PVR5)&XG
lVQyp~ARu%uYjAjNAW2RjD3dP?9RVzp9}Ok}DYF$6V-iTN7vBH?

diff --git a/build/classes/db/telaccount_sql.xml b/build/classes/db/telaccount_sql.xml
index eae30c4..c70583f 100644
--- a/build/classes/db/telaccount_sql.xml
+++ b/build/classes/db/telaccount_sql.xml
@@ -6,7 +6,7 @@
      	
      	 SELECT y.USER_ID as id,
     	 z.CNAME ,
-	     y.AGENT_ID  as account
+	     y.AGENT_ID  as account,y.mobile1,y.mobile2
 FROM
 	RUSH_USER_AGENT y
 	LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID 
@@ -52,13 +52,18 @@ FROM
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,
diff --git a/build/classes/html/rush/accountadd.html b/build/classes/html/rush/accountadd.html
index 3577f7c..b6ad27c 100644
--- a/build/classes/html/rush/accountadd.html
+++ b/build/classes/html/rush/accountadd.html
@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -61,6 +63,8 @@
 			var one = {};
 			one['accountname']=aos.get('accountname').getValue();
 			one['account']=aos.get('account').getValue();
+			one['mobile1']=aos.get('mobile1').getValue();
+			one['mobile2']=aos.get('mobile2').getValue();
 			aos.post({
 				url:"rush/telaccount/save",
 				data:one,
diff --git a/build/classes/html/rush/rushtasklistdetail.html b/build/classes/html/rush/rushtasklistdetail.html
index 8854390..0fd3475 100644
--- a/build/classes/html/rush/rushtasklistdetail.html
+++ b/build/classes/html/rush/rushtasklistdetail.html
@@ -390,50 +390,69 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
-				var calldata = aos.getForm().getData();		
-				calldata['customer_id']=aos.get('customer_id').getValue();
-				calldata['end_date']=aos.get('end_date').getValue();
-				mb+=mobile+',';
-				
+				var one = {};
+				one['mobile']=mobile;
 				aos.post({
-					url:"rush/search/isCall",
-					data:calldata,
+					url:"rush/telaccount/check",
+					data:one,
 					success:function(rtnData){
-						// 2018.1.31 暂时去掉正在联系的判断
-						if(rtnData.called=="A"){
-							aos.alert('客户正在联系中');
-							return;
-						}else{
-							aos.get("is_call").setValue("Y");
-							aos.get("customername").setValue(data.contact);
-	                        parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
-	                        parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
-	                       parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
-	                        if(parent.document.getElementById('CallJS').value==1){
-	                         if(mobile.substr(0,1)=='0'){
-								    	
-								  }else{
-								    if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
-								    		 mobile = areacode+mobile;
-								    	}else{
-								    		if(null==areacode||areacode==""){
-								    			mobile = zz+mobile;
-								    		}
-								    	}
-								    }
-	                        	 if(parent.document.getElementById("newnewbarInit").value==1){
-									 window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
-								 }else{
-									 window.parent.application.oJVccBar.MakeCall(mobile);
-								 }
-							}else{
-								aos.alert('请在主页面初始化电话条！');
-								return ;
-							}
-							
-						}
+					if(rtnData=="1"){
+						aos.alert('所选电话不是本人测试电话电话，不允许拨打！');
+						return;
 					}
-				});
+					else{
+						var calldata = aos.getForm().getData();
+						calldata['customer_id']=aos.get('customer_id').getValue();
+						calldata['end_date']=aos.get('end_date').getValue();
+						mb+=mobile+',';
+
+						aos.post({
+							url:"rush/search/isCall",
+							data:calldata,
+							success:function(rtnData){
+								// 2018.1.31 暂时去掉正在联系的判断
+								if(rtnData.called=="A"){
+									aos.alert('客户正在联系中');
+									return;
+								}else{
+									aos.get("is_call").setValue("Y");
+									aos.get("customername").setValue(data.contact);
+									parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
+									parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
+									parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
+									if(parent.document.getElementById('CallJS').value==1){
+										if(mobile.substr(0,1)=='0'){
+
+										}else{
+											if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
+												mobile = areacode+mobile;
+											}else{
+												if(null==areacode||areacode==""){
+													mobile = zz+mobile;
+												}
+											}
+										}
+										if(parent.document.getElementById("newnewbarInit").value==1){
+											window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
+										}else{
+											window.parent.application.oJVccBar.MakeCall(mobile);
+										}
+									}else{
+										aos.alert('请在主页面初始化电话条！');
+										return ;
+									}
+
+								}
+							}
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}
diff --git a/build/classes/html/rush/telaccount.html b/build/classes/html/rush/telaccount.html
index 74d221d..4c2a366 100644
--- a/build/classes/html/rush/telaccount.html
+++ b/build/classes/html/rush/telaccount.html
@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -64,8 +67,25 @@
 				
 			});
 		}
-		
-		
+
+		function update(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			var param = {}
+			param['id'] = data.id;
+			param['account'] = data.account;
+			param['mobile1'] = data.mobile1;
+			param['mobile2'] = data.mobile2;
+			param['cname'] = data.cname;
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){
+				grid.reload();
+
+			});
+		}
 		
 		
 		
diff --git a/build/classes/html/tick/shijidetail.html b/build/classes/html/tick/shijidetail.html
index bf77a03..2fe491a 100644
--- a/build/classes/html/tick/shijidetail.html
+++ b/build/classes/html/tick/shijidetail.html
@@ -10,6 +10,7 @@
 				<div field="kpy" width="15"  header="开票人"></div>
 				<div field="custname" width="40" header="客户名称"></div>
 				<div field="kprq" width="20" header="开票日期"></div>
+				<div field="kpxm" width="20" header="开票姓名"></div>
 				<div field="flag" width="15" header="开票方式"></div>
 			</div>	
 		</div>
diff --git a/build/classes/rush/TaskAuthJob.class b/build/classes/rush/TaskAuthJob.class
index bf0d598db43bd6dfa5452b2eb8bec625aaf8b334..6ace3e6d5fedc383831e18ca33f0a36635766a9a 100644
GIT binary patch
delta 18
acmdnwy~%sSYj##6Lj^;#%^%ng$pQdJZ3h(q

delta 18
acmdnwy~%sSYj##cGX(?7%^%ng$pQdJn+F>J

diff --git a/build/classes/rush/TelAccountAction.class b/build/classes/rush/TelAccountAction.class
index 90575fd40b0b57f66cb349b47a5a9f89eed2f662..a4d7c9b5fafe95173a2bf20200376e8e76936952 100644
GIT binary patch
delta 2542
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

delta 1704
zcmah}`%_e97=F&~a?ZDh6Xx!6)3DHn2u&2ll1zoTQ&Is6M&h<CfpQC$ix*t6>|*!6
z?opXtr80>`qm-n(WtZs>X!^OCX8NV3X>@wNbC$(%nrV0TyMNE~J<t2TdwSV)cJ$2o
z$x{GU;wKXe(PN?)5rIAv{TMJXXd*!^?!ZogU21W6B8IR>AgUJk3JeSEOT<06*TjC@
zr<(f>JRtC(2_Fs^c*sPuLh#{Xfk#X{ipNYmjwb}l1S&)oHV8bafTh4w0#6%wM(sbV
zmYx%MUf>0R7u9S;;3a{V)$kR8g95J#91?g<;B|pF47@q^r%Th`9{*b#(Tu|eMh(0p
zN8GjAyW@YjOEkSX+#ZgE<wU~v#1&X+;5`dR@V;E4XXr;QjNt=Wt*3ZLEsWzs4Vf}m
zPfID<Q5Xt!^>s!p9K!?wEgZ)QIik<c{s@yA^qz2UUwcG@r=-53*1%y4ALA1PCoP=9
zl!Z?*C4bTLt5@K(hNNx5{$Orjq^&)-I2Z|An8s%sTy4z;KDY1%rVM<k?ti5rJrZsY
zI?PLZgZ<&!aC`hAU*j7YGAhLxd~4x5oR!Cn9{2ZrevYWrf52G{tK~H!OCA&<nd&W1
zPwwgKZOxrUC=5l~x;hQ~C=1O)+Lf}<lQuplalmcrecjD`mxgSaIp->QBx%03l)IP7
zt)?%EOyn^^)W-`AbdYU6XSwV(_6a%1p^b6i!Ya19z39ia99zx-T!+=1X(+(;Jf$wL
zg_|S5JOP)_y?6qiqnurckZvQSEO(B@Ab0_5a08*%@^~WqBK~gdC9;NM2VL&J^k;3A
zY?#{=Rd49#u>u58f>Ne*E9y~(a*jGsg9?sx46?066$}hx9d5$S5I8_B8@TQz!gQQ`
zIz}!qiE7-!r(MGIxD~fiO&UgtSPBnnc_)Q?1*JA^9m$-{I&N;{rXQa3$ThIZK)r#6
z1%ZFic(I^j3fhd@36n2}eA%VSTGRHTkl;m*Ircm?{=C%x_GUAo8e`u4=F4c9g{mNA
zl?`<T6{vVQky0baW<`02tyCEv;4Ef%BepuuH?j-jPTtR#L4QVc7QKe(wf~DAqGvAK
zGnFlhFN8X_&E#_-Z2NKnZ*Yb;$kQ$HeA+^O4{s#NbACUgKR4j7QPIzFR^z&oV!GVS
zin|zJ7nM2+-EpRvu$CFAEo5p%8_(s-fj}G4e+?|MbIU=mkE7Se&{cr8VLNXu;kTV5
zw;gx`+Bt00oa|MiVpOd&RIQ}yaH7t~|HYIv*oRe-Ec2Yi!Up$ZU)lr~)lA6WldGc3
zSvZ$(nytM&ssRR=AcL64zv%_oiL0@T1-zS14Y5M@Fy2w->s}_;Fg@O9$EVz(iR%c*
zbj;&vRV^+emD$zeCf*vmT0F>W;=h3^mjr_6*yW;MY+}cZvJP6%$;Y|S6;JhUs%7oo
WjY4ktxU~*%VSSbtTi7>cdH)3?rxln0

diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml
index eae30c4..c70583f 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/telaccount_sql.xml
@@ -6,7 +6,7 @@
      	
      	 SELECT y.USER_ID as id,
     	 z.CNAME ,
-	     y.AGENT_ID  as account
+	     y.AGENT_ID  as account,y.mobile1,y.mobile2
 FROM
 	RUSH_USER_AGENT y
 	LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID 
@@ -52,13 +52,18 @@ FROM
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/accountadd.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/accountadd.html
index 3577f7c..b6ad27c 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/accountadd.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/accountadd.html
@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -61,6 +63,8 @@
 			var one = {};
 			one['accountname']=aos.get('accountname').getValue();
 			one['account']=aos.get('account').getValue();
+			one['mobile1']=aos.get('mobile1').getValue();
+			one['mobile2']=aos.get('mobile2').getValue();
 			aos.post({
 				url:"rush/telaccount/save",
 				data:one,
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html
index 8854390..0fd3475 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/rushtasklistdetail.html
@@ -390,50 +390,69 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
-				var calldata = aos.getForm().getData();		
-				calldata['customer_id']=aos.get('customer_id').getValue();
-				calldata['end_date']=aos.get('end_date').getValue();
-				mb+=mobile+',';
-				
+				var one = {};
+				one['mobile']=mobile;
 				aos.post({
-					url:"rush/search/isCall",
-					data:calldata,
+					url:"rush/telaccount/check",
+					data:one,
 					success:function(rtnData){
-						// 2018.1.31 暂时去掉正在联系的判断
-						if(rtnData.called=="A"){
-							aos.alert('客户正在联系中');
-							return;
-						}else{
-							aos.get("is_call").setValue("Y");
-							aos.get("customername").setValue(data.contact);
-	                        parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
-	                        parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
-	                       parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
-	                        if(parent.document.getElementById('CallJS').value==1){
-	                         if(mobile.substr(0,1)=='0'){
-								    	
-								  }else{
-								    if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
-								    		 mobile = areacode+mobile;
-								    	}else{
-								    		if(null==areacode||areacode==""){
-								    			mobile = zz+mobile;
-								    		}
-								    	}
-								    }
-	                        	 if(parent.document.getElementById("newnewbarInit").value==1){
-									 window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
-								 }else{
-									 window.parent.application.oJVccBar.MakeCall(mobile);
-								 }
-							}else{
-								aos.alert('请在主页面初始化电话条！');
-								return ;
-							}
-							
-						}
+					if(rtnData=="1"){
+						aos.alert('所选电话不是本人测试电话电话，不允许拨打！');
+						return;
 					}
-				});
+					else{
+						var calldata = aos.getForm().getData();
+						calldata['customer_id']=aos.get('customer_id').getValue();
+						calldata['end_date']=aos.get('end_date').getValue();
+						mb+=mobile+',';
+
+						aos.post({
+							url:"rush/search/isCall",
+							data:calldata,
+							success:function(rtnData){
+								// 2018.1.31 暂时去掉正在联系的判断
+								if(rtnData.called=="A"){
+									aos.alert('客户正在联系中');
+									return;
+								}else{
+									aos.get("is_call").setValue("Y");
+									aos.get("customername").setValue(data.contact);
+									parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
+									parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
+									parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
+									if(parent.document.getElementById('CallJS').value==1){
+										if(mobile.substr(0,1)=='0'){
+
+										}else{
+											if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
+												mobile = areacode+mobile;
+											}else{
+												if(null==areacode||areacode==""){
+													mobile = zz+mobile;
+												}
+											}
+										}
+										if(parent.document.getElementById("newnewbarInit").value==1){
+											window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
+										}else{
+											window.parent.application.oJVccBar.MakeCall(mobile);
+										}
+									}else{
+										aos.alert('请在主页面初始化电话条！');
+										return ;
+									}
+
+								}
+							}
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html
index 74d221d..4c2a366 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/rush/telaccount.html
@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -64,8 +67,25 @@
 				
 			});
 		}
-		
-		
+
+		function update(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			var param = {}
+			param['id'] = data.id;
+			param['account'] = data.account;
+			param['mobile1'] = data.mobile1;
+			param['mobile2'] = data.mobile2;
+			param['cname'] = data.cname;
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){
+				grid.reload();
+
+			});
+		}
 		
 		
 		
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html
index bf77a03..2fe491a 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijidetail.html
@@ -10,6 +10,7 @@
 				<div field="kpy" width="15"  header="开票人"></div>
 				<div field="custname" width="40" header="客户名称"></div>
 				<div field="kprq" width="20" header="开票日期"></div>
+				<div field="kpxm" width="20" header="开票姓名"></div>
 				<div field="flag" width="15" header="开票方式"></div>
 			</div>	
 		</div>
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TaskAuthJob.class
index bf0d598db43bd6dfa5452b2eb8bec625aaf8b334..6ace3e6d5fedc383831e18ca33f0a36635766a9a 100644
GIT binary patch
delta 18
acmdnwy~%sSYj##6Lj^;#%^%ng$pQdJZ3h(q

delta 18
acmdnwy~%sSYj##cGX(?7%^%ng$pQdJn+F>J

diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/TelAccountAction.class
index 90575fd40b0b57f66cb349b47a5a9f89eed2f662..a4d7c9b5fafe95173a2bf20200376e8e76936952 100644
GIT binary patch
delta 2542
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

delta 1704
zcmah}`%_e97=F&~a?ZDh6Xx!6)3DHn2u&2ll1zoTQ&Is6M&h<CfpQC$ix*t6>|*!6
z?opXtr80>`qm-n(WtZs>X!^OCX8NV3X>@wNbC$(%nrV0TyMNE~J<t2TdwSV)cJ$2o
z$x{GU;wKXe(PN?)5rIAv{TMJXXd*!^?!ZogU21W6B8IR>AgUJk3JeSEOT<06*TjC@
zr<(f>JRtC(2_Fs^c*sPuLh#{Xfk#X{ipNYmjwb}l1S&)oHV8bafTh4w0#6%wM(sbV
zmYx%MUf>0R7u9S;;3a{V)$kR8g95J#91?g<;B|pF47@q^r%Th`9{*b#(Tu|eMh(0p
zN8GjAyW@YjOEkSX+#ZgE<wU~v#1&X+;5`dR@V;E4XXr;QjNt=Wt*3ZLEsWzs4Vf}m
zPfID<Q5Xt!^>s!p9K!?wEgZ)QIik<c{s@yA^qz2UUwcG@r=-53*1%y4ALA1PCoP=9
zl!Z?*C4bTLt5@K(hNNx5{$Orjq^&)-I2Z|An8s%sTy4z;KDY1%rVM<k?ti5rJrZsY
zI?PLZgZ<&!aC`hAU*j7YGAhLxd~4x5oR!Cn9{2ZrevYWrf52G{tK~H!OCA&<nd&W1
zPwwgKZOxrUC=5l~x;hQ~C=1O)+Lf}<lQuplalmcrecjD`mxgSaIp->QBx%03l)IP7
zt)?%EOyn^^)W-`AbdYU6XSwV(_6a%1p^b6i!Ya19z39ia99zx-T!+=1X(+(;Jf$wL
zg_|S5JOP)_y?6qiqnurckZvQSEO(B@Ab0_5a08*%@^~WqBK~gdC9;NM2VL&J^k;3A
zY?#{=Rd49#u>u58f>Ne*E9y~(a*jGsg9?sx46?066$}hx9d5$S5I8_B8@TQz!gQQ`
zIz}!qiE7-!r(MGIxD~fiO&UgtSPBnnc_)Q?1*JA^9m$-{I&N;{rXQa3$ThIZK)r#6
z1%ZFic(I^j3fhd@36n2}eA%VSTGRHTkl;m*Ircm?{=C%x_GUAo8e`u4=F4c9g{mNA
zl?`<T6{vVQky0baW<`02tyCEv;4Ef%BepuuH?j-jPTtR#L4QVc7QKe(wf~DAqGvAK
zGnFlhFN8X_&E#_-Z2NKnZ*Yb;$kQ$HeA+^O4{s#NbACUgKR4j7QPIzFR^z&oV!GVS
zin|zJ7nM2+-EpRvu$CFAEo5p%8_(s-fj}G4e+?|MbIU=mkE7Se&{cr8VLNXu;kTV5
zw;gx`+Bt00oa|MiVpOd&RIQ}yaH7t~|HYIv*oRe-Ec2Yi!Up$ZU)lr~)lA6WldGc3
zSvZ$(nytM&ssRR=AcL64zv%_oiL0@T1-zS14Y5M@Fy2w->s}_;Fg@O9$EVz(iR%c*
zbj;&vRV^+emD$zeCf*vmT0F>W;=h3^mjr_6*yW;MY+}cZvJP6%$;Y|S6;JhUs%7oo
WjY4ktxU~*%VSSbtTi7>cdH)3?rxln0

diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 38ee9af..c46f4bc 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Sun Oct 09 19:00:38 CST 2022
+#Sun Oct 30 20:11:05 CST 2022
 deploystamp=1612237236000
diff --git a/resource/db/telaccount_sql.xml b/resource/db/telaccount_sql.xml
index eae30c4..c70583f 100644
--- a/resource/db/telaccount_sql.xml
+++ b/resource/db/telaccount_sql.xml
@@ -6,7 +6,7 @@
      	
      	 SELECT y.USER_ID as id,
     	 z.CNAME ,
-	     y.AGENT_ID  as account
+	     y.AGENT_ID  as account,y.mobile1,y.mobile2
 FROM
 	RUSH_USER_AGENT y
 	LEFT JOIN AOS_RMS_USER z ON y.USER_ID = z.CGUID 
@@ -52,13 +52,18 @@ FROM
 				<i id="save"><![CDATA[
 		    insert into RUSH_USER_AGENT
 			  (user_id,
-			   agent_id)
+			   agent_id,mobile1,mobile2)
 			values
 			  (
 			   {accountname},
-			   {account})
+			   {account},{mobile1},{mobile2})
 			   
 		]]></i>
+
+		<i id="update"><![CDATA[
+        update RUSH_USER_AGENT set mobile1={mobile1},mobile2={mobile2}  where USER_ID={accountname}
+		]]></i>
+
 		<i id="savetel"><![CDATA[
 		    insert into RUSH_TEL_ACCOUNT
 			  (id,
diff --git a/resource/html/rush/accountadd.html b/resource/html/rush/accountadd.html
index 3577f7c..b6ad27c 100644
--- a/resource/html/rush/accountadd.html
+++ b/resource/html/rush/accountadd.html
@@ -19,6 +19,8 @@
 			emptyText="请选择"  textField="cname" valueField="cguid"  allowInput="false" 
 			showNullItem="true"  onvaluechanged="getRevenue" />
 		<br/>
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
 		
 			
 		
@@ -61,6 +63,8 @@
 			var one = {};
 			one['accountname']=aos.get('accountname').getValue();
 			one['account']=aos.get('account').getValue();
+			one['mobile1']=aos.get('mobile1').getValue();
+			one['mobile2']=aos.get('mobile2').getValue();
 			aos.post({
 				url:"rush/telaccount/save",
 				data:one,
diff --git a/resource/html/rush/accountupdate.html b/resource/html/rush/accountupdate.html
new file mode 100644
index 0000000..38776b0
--- /dev/null
+++ b/resource/html/rush/accountupdate.html
@@ -0,0 +1,55 @@
+<html   login="false">
+	<head>
+		<title>反馈资料</title>
+	</head>
+	<body>
+		<div widget="toolbar">
+			
+			
+			<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			
+			<a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		
+		
+		<input widget="hidden" name="id" label="id"  readonly="true" style="margin-top:5px"/>	<br/>
+		<input widget="num"  name="account" label="鸿联电话" required="true"  allowInput="false" style="margin-top:5px" />
+		<input widget="edit"  name="accountname" label="员工姓名" required="true"  allowInput="false" style="margin-top:5px" />
+		<input widget="num"  name="mobile1" label="测试电话1" required="true"  style="margin-top:5px" />
+		<input widget="num"  name="mobile2" label="测试电话2" required="true"  style="margin-top:5px" />
+		
+			
+		
+		
+		
+	</body>
+	<script type="text/javascript">
+ 	var grid = aos.get('grid');
+	grid.load();
+	 function init(param){
+		 aos.get("account").setValue(param['account']);
+		 aos.get("accountname").setValue(param['cname']);
+		 aos.get("mobile1").setValue(param['mobile1']);
+		 aos.get("mobile2").setValue(param['mobile2']);
+		 aos.get("id").setValue(param['id']);
+         } 
+		
+		function save(){
+			var one = {};
+			one['accountname']=aos.get('id').getValue();
+			one['mobile1']=aos.get('mobile1').getValue();
+			one['mobile2']=aos.get('mobile2').getValue();
+			aos.post({
+				url:"rush/telaccount/update",
+				data:one,
+
+				success:function(){
+					 aos.tip('保存成功');
+					 CloseWindow();
+				}
+			
+			});
+		}
+		
+	</script>	
+</html>
\ No newline at end of file
diff --git a/resource/html/rush/rushtasklistdetail.html b/resource/html/rush/rushtasklistdetail.html
index 8854390..0fd3475 100644
--- a/resource/html/rush/rushtasklistdetail.html
+++ b/resource/html/rush/rushtasklistdetail.html
@@ -390,50 +390,69 @@
 					aos.alert('选中的联系人没有联系电话请更改，谢谢~');
 					return;
 				}
-				var calldata = aos.getForm().getData();		
-				calldata['customer_id']=aos.get('customer_id').getValue();
-				calldata['end_date']=aos.get('end_date').getValue();
-				mb+=mobile+',';
-				
+				var one = {};
+				one['mobile']=mobile;
 				aos.post({
-					url:"rush/search/isCall",
-					data:calldata,
+					url:"rush/telaccount/check",
+					data:one,
 					success:function(rtnData){
-						// 2018.1.31 暂时去掉正在联系的判断
-						if(rtnData.called=="A"){
-							aos.alert('客户正在联系中');
-							return;
-						}else{
-							aos.get("is_call").setValue("Y");
-							aos.get("customername").setValue(data.contact);
-	                        parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
-	                        parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
-	                       parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
-	                        if(parent.document.getElementById('CallJS').value==1){
-	                         if(mobile.substr(0,1)=='0'){
-								    	
-								  }else{
-								    if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
-								    		 mobile = areacode+mobile;
-								    	}else{
-								    		if(null==areacode||areacode==""){
-								    			mobile = zz+mobile;
-								    		}
-								    	}
-								    }
-	                        	 if(parent.document.getElementById("newnewbarInit").value==1){
-									 window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
-								 }else{
-									 window.parent.application.oJVccBar.MakeCall(mobile);
-								 }
-							}else{
-								aos.alert('请在主页面初始化电话条！');
-								return ;
-							}
-							
-						}
+					if(rtnData=="1"){
+						aos.alert('所选电话不是本人测试电话电话，不允许拨打！');
+						return;
 					}
-				});
+					else{
+						var calldata = aos.getForm().getData();
+						calldata['customer_id']=aos.get('customer_id').getValue();
+						calldata['end_date']=aos.get('end_date').getValue();
+						mb+=mobile+',';
+
+						aos.post({
+							url:"rush/search/isCall",
+							data:calldata,
+							success:function(rtnData){
+								// 2018.1.31 暂时去掉正在联系的判断
+								if(rtnData.called=="A"){
+									aos.alert('客户正在联系中');
+									return;
+								}else{
+									aos.get("is_call").setValue("Y");
+									aos.get("customername").setValue(data.contact);
+									parent.document.getElementById('info').value="联系"+data.contact+"("+mobile+");"+"客户名称："+aos.get("cust_name").getValue()+";"+"到期时间："+aos.get("end_date").getValue();
+									parent.document.getElementById('end_date').value=aos.get("end_date").getValue();
+									parent.document.getElementById('customer_id').value=aos.get('customer_id').getValue();
+									if(parent.document.getElementById('CallJS').value==1){
+										if(mobile.substr(0,1)=='0'){
+
+										}else{
+											if((/^1(3|4|5|7|8)\d{9}$/.test(mobile))){
+												mobile = areacode+mobile;
+											}else{
+												if(null==areacode||areacode==""){
+													mobile = zz+mobile;
+												}
+											}
+										}
+										if(parent.document.getElementById("newnewbarInit").value==1){
+											window.parent.phoneBar.agentApi.makeCall(data.mobile,-1,3);
+										}else{
+											window.parent.application.oJVccBar.MakeCall(mobile);
+										}
+									}else{
+										aos.alert('请在主页面初始化电话条！');
+										return ;
+									}
+
+								}
+							}
+						});}
+
+
+
+					}})
+
+
+
+
 			}
 			
 		}
diff --git a/resource/html/rush/telaccount.html b/resource/html/rush/telaccount.html
index 74d221d..4c2a366 100644
--- a/resource/html/rush/telaccount.html
+++ b/resource/html/rush/telaccount.html
@@ -8,14 +8,17 @@
 			<input widget="edit" name="acc" label="电话"/>
 			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-add" onclick="update()">修改</a>
 			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
 		</div>
 		<div widget="autosize">
 			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/telaccount/getList"  allowalternating="true">
-				<div type="indexcolumn" width="15" header="序号"></div>
-				<div field="cname"  width="15" header="姓名">></div>
+				<div type="indexcolumn" width="50" header="序号"></div>
+				<div field="cname"  width="50" header="姓名">></div>
 				<div field="id"    visible="false"></div>
-				<div field="account" width="70"  header="鸿联电话"></div>
+				<div field="account" width="50"  header="鸿联电话"></div>
+				<div field="mobile1" width="50"  header="测试电话1"></div>
+				<div field="mobile2" width="50"  header="测试电话2"></div>
 			</div>
 			
 				
@@ -64,8 +67,25 @@
 				
 			});
 		}
-		
-		
+
+		function update(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			var param = {}
+			param['id'] = data.id;
+			param['account'] = data.account;
+			param['mobile1'] = data.mobile1;
+			param['mobile2'] = data.mobile2;
+			param['cname'] = data.cname;
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/rush/accountupdate', param, '300px', '300px', '鸿联账号修改', function(rtnValue){
+				grid.reload();
+
+			});
+		}
 		
 		
 		
diff --git a/src/rush/TaskAuthJob.java b/src/rush/TaskAuthJob.java
index f9ccc1a..391ff4c 100644
--- a/src/rush/TaskAuthJob.java
+++ b/src/rush/TaskAuthJob.java
@@ -17,7 +17,7 @@ import java.util.Map.Entry;
  *
  * 2018年11月26日  新
  */
-@Job("0 16 09 * * ?")
+@Job("0 21 16 * * ?")
 public class TaskAuthJob extends BaseJob{
 
 
diff --git a/src/rush/TelAccountAction.java b/src/rush/TelAccountAction.java
index 43a52ff..63d5f46 100644
--- a/src/rush/TelAccountAction.java
+++ b/src/rush/TelAccountAction.java
@@ -112,6 +112,13 @@ public class TelAccountAction {
 	          } 
 		
 	}
+	@Request.Get("update")
+	@Request.Post("update")
+	public void update(Params params){
+			DbHelper.getDbService().updateById("telaccount.update", params);
+	}
+
+
 	// 删除操作
 	@Request.Get("delete")
 	@Request.Post("delete")
@@ -128,6 +135,27 @@ public class TelAccountAction {
 			params.put("create_date", create_date);
 		 DbHelper.getDbService().updateById("telaccount.savetel", params);
 	}
+
+
+
+	//打电话之前会进行判断
+	@Request.Get("check")
+	@Request.Post("check")
+	public String check (Params params){
+		String mobile=params.getString("mobile").replaceAll("\\s*|\r|\n|\t","");
+		List<Map> phons=DbHelper.getDbService().queryMapList("select USER_ID from RUSH_USER_AGENT where (mobile1=? or mobile2=? )",mobile,mobile);
+		String userid=SessionHelper.getCurrentUserId();
+		if(phons.size()==0){
+			return "0";
+		}
+		Map userphone=DbHelper.getDbService().queryMap("select USER_ID from RUSH_USER_AGENT where ( mobile1=? or mobile2=?) and  user_id=?",mobile,mobile,userid);
+        if(userphone!=null){
+        	return  "0";
+		}
+		return "1";
+	}
+
+
 }