Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
ZYjames12345
/
zhujian_OA
1
0
Fork 0

2 Commity 7a6add3592 ... 107042af8c

Autor SHA1 Správa Dátum
  liranlong 107042af8c 合并冲突 6 dní pred
  liranlong c11254b09a 增加呈批时限更新 6 dní pred
11 zmenil súbory, kde vykonal 157 pridanie a 30 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 3 3
      apiurljs.js
  2. 5 1
      tpl/SJPSDB/SJPSDB/formeditFL.html
  3. 17 0
      tpl/SJPSDB/SJPSDB/js/formeditFL.js
  4. 4 1
      tpl/shemidb/SMDBD/formeditFL.html
  5. 25 1
      tpl/shemidb/SMDBD/js/formeditFL.js
  6. 6 0
      tpl/shixiangdb/SXDBD/formeditFL.html
  7. 6 0
      tpl/shixiangdb/SXDBD/formeditZW.html
  8. 26 2
      tpl/shixiangdb/SXDBD/js/formeditFL.js
  9. 40 0
      tpl/shixiangdb/SXDBD/js/formeditZW.js
  10. 12 11
      tpl/shouwenbg/LDPSD/js/formeditFL.js
  11. 13 11
      tpl/shouwenbg/WJCBD/js/formeditFL.js

+ 3 - 3
apiurljs.js
Zobraziť súbor 

@@ -1,12 +1,12 @@
 
 //首先： special命名为sp
 
 var apiurljs = window.NameSpace || {};
 
 
-apiurljs.login = "http://192.168.3.96:8088/glwork/";
 
+apiurljs.login = "http://192.168.3.152:8088/glwork/";
 
 
 apiurljs.onePic = "http://10.149.1.56:8077/"
 
 
-apiurljs.yzFcscloud = "http://192.168.3.96:8088/glwork/"
 
-apiurljs.yzFileWo = "http://192.168.3.96:8088/wo/";
 
+apiurljs.yzFcscloud = "http://192.168.3.152:8088/glwork/"
 
+apiurljs.yzFileWo = "http://192.168.3.152:8088/wo/";
 
 
 //老OA公文地址
 
 apiurljs.seeyon = "http://192.168.1.113:86/seeyon"

+ 5 - 1
tpl/SJPSDB/SJPSDB/formeditFL.html
Zobraziť súbor 

@@ -226,7 +226,11 @@
 
                                                     </button>
 
                                                 </div>
 
                                                 <div class="sp-page-center" style="width: 95%; max-width: 900px; padding: 60px 40px; background-color: #fff; color: #ff0000; line-height: 30px; overflow-y: auto; ">
 
-                                                    <div class="sp-page sp-page-table">
 
+                                                    <div class="sp-page sp-pl-5">
 
+                                                        <span class="sp-page-col sp-mr-10">呈批时限：</span>
 
+                                                        <input type="text" class="sp-input laydate-logo" style="width:200px" sp-laydate ng-model="ctl.data.CPSX" ng-disabled="ctl.hide('readonly','CPSX')" ng-change="ctl.changeFiled('CPSX')" />
 
+                                                    </div>
 
+																										<div class="sp-page sp-page-table">
 
                                                         <table>
 
                                                             <tr>
 
                                                                 <td>文件/会议名称</td>

+ 17 - 0
tpl/SJPSDB/SJPSDB/js/formeditFL.js
Zobraziť súbor 

@@ -297,6 +297,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
     }
 
   
     self.readonly = {
 
+			CPSX:false,
 
         TITLE: false,
 
         CHDATE: false,
 
         SJPS: false,
 
@@ -483,6 +484,8 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         .success(function (obj) {
 
             var res = strToJson(s4.decryptData_CBC(obj.data));
 
             self.data = {
 
+							
+								CPSX:res.data.SX_SJPSDU.CPSX == "" ? sp.format(sp.getLocalDate()) : sp.format(res.data.SX_SJPSDU.CPSX),
 
                 ID: res.data.SX_SJPSDU.ID,
 
                 APPCODE: res.data.SX_SJPSDU.APPCODE,
 
                 TITLE: res.data.SX_SJPSDU.TITLE == "" ? sp.getUrlName("TITLE") != "" ? decodeURIComponent(sp.getUrlName("TITLE")) : "" : res.data.SX_SJPSDU.TITLE,
 
@@ -504,6 +507,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
             self.XBCSROWS = Math.ceil(self.data.XBCS.length / 13) < 1 ? 1 : Math.ceil(self.data.XBCS.length / 13)
 
             self.SJPSROWS = Math.ceil(self.data.SJPS.length / 34) < 15 ? 15 : Math.ceil(self.data.SJPS.length / 34);
 
             self.readonly = {
 
+									CPSX:res.data.SX_SJPSDU["CPSX.EREADONLY"] == "true",
 
                 TITLE: res.data.SX_SJPSDU["TITLE.EREADONLY"] == "true",
 
                 CHDATE: res.data.SX_SJPSDU["CHDATE.EREADONLY"] == "true",
 
                 SJPS: res.data.SX_SJPSDU["SJPS.EREADONLY"] == "true",
 
@@ -1720,6 +1724,19 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         if (str = "XBCS") {
 
             self.XBCSROWS = Math.ceil(self.data.XBCS.length / 13) < 1 ? 1 : Math.ceil(self.data.XBCS.length / 13)
 
         }
 
+				
+				if(str == "DBSX"){
 
+					let objDate = new Date()
 
+					let DBSXDate = new Date(self.data.DBSX)
 
+					let dif_t = DBSXDate.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
+					}
 
+					
+				}
 
     }
 
 
     //转发

+ 4 - 1
tpl/shemidb/SMDBD/formeditFL.html
Zobraziť súbor 

@@ -1,4 +1,5 @@
 
-<!DOCTYPE html>
 
+
 
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml" ng-app="app">
 
 <head>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
@@ -204,6 +205,8 @@
 
                                                         <select class="sp-select" style="width:200px" ng-model="ctl.data.LX" ng-disabled="ctl.hide('readonly','LX')" ng-change="ctl.changeFiled('LX')">
 
                                                             <option ng-repeat="item in ctl.BHLX" value="{{item.CODE}}" ng-bind="item.CNAME"></option>
 
                                                         </select>
 
+																												<span class="sp-mr-10" >呈批时限：</span>
 
+																												<input type="text" class="sp-input" style="width:150px" sp-laydate ng-model="ctl.data.CPSX" ng-disabled="ctl.hide('readonly','CPSX')" ng-change="ctl.changeFiled('CPSX')" />
 
                                                     </div>
 
                                                     <div class="sp-page sp-page-table">
 
                                                         <table>

+ 25 - 1
tpl/shemidb/SMDBD/js/formeditFL.js
Zobraziť súbor 

@@ -295,6 +295,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
     }
 
 
     self.readonly = {
 
+			CPSX:false,
 
         BH: false,
 
         LX: false,
 
         BT: false,
 
@@ -306,6 +307,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         BZ: false
 
     }
 
     self.show = {
 
+			CPSX:false,
 
         BH: false,
 
         LX: false,
 
         BT: false,
 
@@ -328,8 +330,10 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
             routeid: self.routeid,
 
             formeditid: ""
 
         }
 
+			
         $http.post(apiurljs.login + "g2app/abase/queryDataLink", { data: s4.encryptData_CBC(JSON.stringify(data)) }, postCfg)
 
         .success(function (obj) {
 
+
 
             var res = strToJson(s4.decryptData_CBC(obj.data));
 
             if (self.copyrightid == "") {
 
                 self.copyrightid = res.data.LINKS[0].COPYRIGHTID
 
@@ -360,7 +364,6 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         })
 
     }
 
     self.getSwenList(0)
 
-
 
     self.getFLOW = function () {
 
         var data = {
 
             copyrightid: self.copyrightid
 
@@ -386,6 +389,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         })
 
     }
 
     self.getGWZL = function () {
 
+
 
         var data = {
 
             tablename: "CODE_GWTYPE",
 
             colums: "ID,CODE,CNAME,FLOWID,DOCFILE,REDFILE",
 
@@ -405,6 +409,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         })
 
     }
 
     self.getDpList = function () {
 
+
 
         var data = {
 
             unitid: "AA"
 
         }
 
@@ -451,6 +456,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
             var res = strToJson(s4.decryptData_CBC(obj.data));
 
             self.userDpName = res.data.length == 0 ? "" : res.data[0].SECTION;
 
             self.userDpCode = res.data.length == 0 ? "" : res.data[0].CODE;
 
+
 
             self.getData();
 
         })
 
     }
 
@@ -464,10 +470,13 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
             routeid: self.routeid,
 
             routeinfoid: self.routeinfoid
 
         }
 
+
 
         $http.post(apiurljs.login + "g2app/abase/queryData", { data: s4.encryptData_CBC(JSON.stringify(data)) }, postCfg)
 
         .success(function (obj) {
 
             var res = strToJson(s4.decryptData_CBC(obj.data));
 
             self.data = {
 
+							
+								CPSX: res.data.DCDB_SMDBD.CPSX,
 
                 ID: res.data.DCDB_SMDBD.ID,
 
                 APPCODE: res.data.DCDB_SMDBD.APPCODE,
 
                 BH: res.data.DCDB_SMDBD.BH,
 
@@ -482,6 +491,8 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
                 GWZL: res.data.DCDB_SMDBD.GWZL == "" ? self.GWZL[0].CODE : res.data.DCDB_SMDBD.GWZL,
 
             }
 
             self.readonly = {
 
+							
+							CPSX: res.data.DCDB_SMDBD["CPSX.EREADONLY"] == "true",
 
                 BH: res.data.DCDB_SMDBD["BH.EREADONLY"] == "true",
 
                 LX: res.data.DCDB_SMDBD["LX.EREADONLY"] == "true",
 
                 BT: res.data.DCDB_SMDBD["BT.EREADONLY"] == "true",
 
@@ -493,6 +504,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
                 BZ: res.data.DCDB_SMDBD["BZ.EREADONLY"] == "true"
 
             }
 
             self.show = {
 
+							CPSX: res.data.DCDB_SMDBD["CPSX.ESHOW"] == "true",
 
                 BH: res.data.DCDB_SMDBD["BH.ESHOW"] == "true",
 
                 LX: res.data.DCDB_SMDBD["LX.ESHOW"] == "true",
 
                 BT: res.data.DCDB_SMDBD["BT.ESHOW"] == "true",
 
@@ -1659,6 +1671,18 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         if (str == "LX") {
 
             self.data.BH = self.data.LX;
 
         }
 
+				if(str == "DBSX"){
 
+					let objDate = new Date()
 
+					let DBSXDate = new Date(self.data.DBSX)
 
+					let dif_t = DBSXDate.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
+					}
 
+					
+				}
 
     }
 
 
     //转发

+ 6 - 0
tpl/shixiangdb/SXDBD/formeditFL.html
Zobraziť súbor 

@@ -165,6 +165,12 @@
 
                                                 </div>
 
                                                 <div class="sp-line-gray"></div>
 
                                             </div>
 
+																						<div class="form-item" ng-if="!ctl.hide('show','CPSX')">
 
+																						    <div class="sp-col-30" style="line-height:32px;" title="呈批时限">呈批时限：</div>
 
+																						    <div class="sp-col-70">
 
+																						        <input type="text" class="sp-input laydate-logo" sp-laydate ng-model="ctl.data.CPSX" ng-disabled="ctl.hide('readonly','CPSX')" ng-change="ctl.changeFiled('CPSX')" />
 
+																						    </div>
 
+																						</div>
 
                                             <div class="form-item" ng-if="!ctl.hide('show','BH')">
 
                                                 <div class="sp-col-30" style="line-height:32px;" title="编号">编号：</div>
 
                                                 <div class="sp-col-70">

+ 6 - 0
tpl/shixiangdb/SXDBD/formeditZW.html
Zobraziť súbor 

@@ -148,6 +148,12 @@
 
                                                 </div>
 
                                                 <div class="sp-line-gray"></div>
 
                                             </div>
 
+																						<div class="form-item" ng-if="!ctl.hide('show','CPSX')">
 
+																						    <div class="sp-col-30" style="line-height:32px;" title="呈批时限">呈批时限：</div>
 
+																						    <div class="sp-col-70">
 
+																						        <input type="text" class="sp-input laydate-logo" sp-laydate ng-model="ctl.data.CPSX" ng-disabled="ctl.hide('readonly','CPSX')" ng-change="ctl.changeFiled('CPSX')" />
 
+																						    </div>
 
+																						</div>
 
                                             <div class="form-item" ng-if="!ctl.hide('show','BH')">
 
                                                 <div class="sp-col-30" style="line-height:32px;" title="编号">编&nbsp;&nbsp;号：</div>
 
                                                 <div class="sp-col-70">

+ 26 - 2
tpl/shixiangdb/SXDBD/js/formeditFL.js
Zobraziť súbor 

@@ -244,7 +244,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
     }
 
 
     self.readonly = {
 
-			
+			 CPSX: false,
 
         BH:false,
 
         DBSX1: false,
 
         PSLD: false,
 
@@ -271,7 +271,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         WLDYJ: false
 
     }
 
     self.show = {
 
-			
+			  CPSX: false,
 
         BH:false,
 
         DBSX1: false,
 
         PSLD: false,
 
@@ -530,6 +530,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
                 SQRUSERID: res.data.DCDB_SXDBD.SQRUSERID == "" ? self.userId : res.data.DCDB_SXDBD.SQRUSERID,
 
             }
 
             self.readonly = {
 
+							CPSX: res.data.DCDB_SXDBD["CPSX.EREADONLY"] == "true",
 
                 BH: res.data.DCDB_SXDBD["BH.EREADONLY"] == "true",
 
                 DBSX1: res.data.DCDB_SXDBD["DBSX1.EREADONLY"] == "true",
 
                 PSLD: res.data.DCDB_SXDBD["PSLD.EREADONLY"] == "true",
 
@@ -554,6 +555,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
                 WLDYJ: res.data.DCDB_SXDBD["WLDYJ.EREADONLY"] == "true"
 
             }
 
             self.show = {
 
+							CPSX: res.data.DCDB_SXDBD["CPSX.ESHOW"] == "true",
 
                 BH: res.data.DCDB_SXDBD["BH.ESHOW"] == "true",
 
                 DBSX1: res.data.DCDB_SXDBD["DBSX1.ESHOW"] == "true",
 
                 PSLD: res.data.DCDB_SXDBD["PSLD.ESHOW"] == "true",
 
@@ -1475,6 +1477,28 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
                 }
 
             })
 
         }
 
+				if(str == "ZZYQWCQX"){
 
+					let objDate = new Date()
 
+					let wcsx_Date = new Date(self.data.ZZYQWCQX)
 
+					let dif_t = wcsx_Date.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.ZZYQWCQX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.ZZYQWCQX, -1);
 
+					}
 
+				}
 
+				if(str == "WCSX" && !Boolean(self.data.ZZYQWCQX)){
 
+					let objDate = new Date()
 
+					let wcsx_Date = new Date(self.data.WCSX)
 
+					let dif_t = wcsx_Date.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.WCSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.WCSX, -1);
 
+					}
 
+				}
 
     }
 
 
     //转发

+ 40 - 0
tpl/shixiangdb/SXDBD/js/formeditZW.js
Zobraziť súbor 

@@ -198,6 +198,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
 		}
 
 
     self.readonly = {
 
+			CPSX: true,
 
         BH:false,
 
         DBSX1: false,
 
         PSLD: false,
 
@@ -225,6 +226,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
         USAGE: false
 
     }
 
     self.show = {
 
+			CPSX: false,
 
         BH: false,
 
         DBSX1: false,
 
         PSLD: false,
 
@@ -773,6 +775,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
         .success(function (obj) {
 
             var res = strToJson(s4.decryptData_CBC(obj.data));
 
             self.data = {
 
+							CPSX: res.data.DCDB_SXDBD.CPSX == "" ? "" : sp.format(res.data.DCDB_SXDBD.CPSX),
 
                 ID: res.data.DCDB_SXDBD.ID,
 
                 APPCODE: res.data.DCDB_SXDBD.APPCODE,
 
                 BH: res.data.DCDB_SXDBD.BH == "" ? self.BH : res.data.DCDB_SXDBD.BH,
 
@@ -806,7 +809,21 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
                 SQRUSERID: res.data.DCDB_SXDBD.SQRUSERID == "" ? self.userId : res.data.DCDB_SXDBD.SQRUSERID,
 
                 USAGE: res.data.DCDB_SXDBD.USAGE ? res.data.DCDB_SXDBD.USAGE : ""
 
             }
 
+						
+						if(!Boolean(self.data.ZZYQWCQX) && (res.data.DCDB_SXDBD.WCSX == "" || res.data.DCDB_SXDBD.WCSX == null)){
 
+								let objDate = new Date()
 
+								let wcsx_Date = new Date(self.data.WCSX)
 
+								let dif_t = wcsx_Date.getTime() - objDate.getTime();
 
+								let Day_dif_t = dif_t/(1000*60*60*24)
 
+								if(Day_dif_t>10){
 
+									self.data.CPSX = sp.getNextDate(self.data.WCSX, -2);
 
+								}else{
 
+									self.data.CPSX = sp.getNextDate(self.data.WCSX, -1);
 
+								}
 
+						}
 
+						
             self.readonly = {
 
+								CPSX: true,
 
                 BH: res.data.DCDB_SXDBD["BH.EREADONLY"] == "true",
 
                 DBSX1: res.data.DCDB_SXDBD["DBSX1.EREADONLY"] == "true",
 
                 PSLD: res.data.DCDB_SXDBD["PSLD.EREADONLY"] == "true",
 
@@ -834,6 +851,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
                 USAGE: res.data.DCDB_SXDBD["USAGE.EREADONLY"] == "true"
 
             }
 
             self.show = {
 
+								CPSX:  res.data.DCDB_SXDBD["CPSX.ESHOW"] == "true",
 
                 BH: res.data.DCDB_SXDBD["BH.ESHOW"] == "true",
 
                 DBSX1: res.data.DCDB_SXDBD["DBSX1.ESHOW"] == "true",
 
                 PSLD: res.data.DCDB_SXDBD["PSLD.ESHOW"] == "true",
 
@@ -1749,6 +1767,28 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
 
                 }
 
             })
 
         }
 
+				if(str == "ZZYQWCQX"){
 
+					let objDate = new Date()
 
+					let wcsx_Date = new Date(self.data.ZZYQWCQX)
 
+					let dif_t = wcsx_Date.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.ZZYQWCQX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.ZZYQWCQX, -1);
 
+					}
 
+				}
 
+				if(str == "WCSX" && !Boolean(self.data.ZZYQWCQX)){
 
+					let objDate = new Date()
 
+					let wcsx_Date = new Date(self.data.WCSX)
 
+					let dif_t = wcsx_Date.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.WCSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.WCSX, -1);
 
+					}
 
+				}
 
     }
 
     
     //转发

+ 12 - 11
tpl/shouwenbg/LDPSD/js/formeditFL.js
Zobraziť súbor 

@@ -1819,18 +1819,19 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         } else {
 
             self.data.SWQXLX = "督办";
 
         }
 
-        if(str == "DBSX"){
 
-            let objDate = new Date()
 
-            let DBSXDate = new Date(self.data.DBSX)
 
-            let dif_t = DBSXDate.getTime() - objDate.getTime();
 
-            let Day_dif_t = dif_t/(1000*60*60*24)
 
-            if(Day_dif_t>10){
 
-                self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
-            }else{
 
-                self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
-            }
 
+
 
+				if(str == "DBSX"){
 
+					let objDate = new Date()
 
+					let DBSXDate = new Date(self.data.DBSX)
 
+					let dif_t = DBSXDate.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
+					}
 
 					
-        }
 
+				}
 
     }
 
     //验证是否重复
 
     self.repeat = false;

+ 13 - 11
tpl/shouwenbg/WJCBD/js/formeditFL.js
Zobraziť súbor 

@@ -1814,18 +1814,20 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 
         //} else {
 
         //    self.data.SFBJRQ = "";
 
         //}
 
-        if(str == "DBSX"){
 
-            let objDate = new Date()
 
-            let DBSXDate = new Date(self.data.DBSX)
 
-            let dif_t = DBSXDate.getTime() - objDate.getTime();
 
-            let Day_dif_t = dif_t/(1000*60*60*24)
 
-            if(Day_dif_t>10){
 
-                self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
-            }else{
 
-                self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
-            }
 
+
 
+				if(str == "DBSX"){
 
+					let objDate = new Date()
 
+					let DBSXDate = new Date(self.data.DBSX)
 
+					let dif_t = DBSXDate.getTime() - objDate.getTime();
 
+					let Day_dif_t = dif_t/(1000*60*60*24)
 
+					if(Day_dif_t>10){
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -2);
 
+					}else{
 
+						self.data.CPSX = sp.getNextDate(self.data.DBSX, -1);
 
+					}
 
 					
-        }
 
+				}
 
+
 
     }
 
     //验证是否重复
 
     self.repeat = false;