合并冲突

tpl/shouwenbg/LDPSD/js/formeditFL.js

@@ -498,6 +498,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
             self.data = {
                 ID: res.data.SW_LDPSCBD.ID,
                 APPCODE: res.data.SW_LDPSCBD.APPCODE,
+                CPSX: res.data.SW_LDPSCBD.CPSX,
                 JJCD: res.data.SW_LDPSCBD.JJCD == "" ? self.JJCD[0].CODE : res.data.SW_LDPSCBD.JJCD,
                 SWLB: res.data.SW_LDPSCBD.SWLB == "" ? self.SWLB[0].CODE : res.data.SW_LDPSCBD.SWLB,
                 SWBH: res.data.SW_LDPSCBD.SWBH == "" ? self.SWBH.replace("|", "〔 ").replace("|", " 〕") + "号" : res.data.SW_LDPSCBD.SWBH,
@@ -1818,7 +1819,7 @@ 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)

tpl/shouwenbg/LDPSD/js/formeditZW.js

@@ -1342,6 +1342,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
             if (self.data.DBSX == "") {
                 sp.dialog("督办时限不能为空！已为您设为来文日期后15天！")
                 self.data.DBSX = sp.getNextDate(self.data.LWRQ, 15);
+                self.data.CPSX = sp.getNextDate(self.data.LWRQ, 13);
                 return
             }
             if (self.data.SWBH1 == "") {

tpl/shouwenbg/WJCBD/js/formeditFL.js

@@ -485,6 +485,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
             self.data = {
                 ID: res.data.SW_ZJWWJCBD.ID,
                 APPCODE: res.data.SW_ZJWWJCBD.APPCODE,
+                CPSX: res.data.SW_ZJWWJCBD.CPSX,
                 JJCD: res.data.SW_ZJWWJCBD.JJCD == "" ? self.JJCD[0].CODE : res.data.SW_ZJWWJCBD.JJCD,
                 MIJI: res.data.SW_ZJWWJCBD.MIJI == "" ? self.MIJI[0].CODE : res.data.SW_ZJWWJCBD.MIJI,
                 SWBH: res.data.SW_ZJWWJCBD.SWBH == "" ? self.SWBH.replace("|", "〔 ").replace("|", " 〕") + "号" : res.data.SW_ZJWWJCBD.SWBH,
@@ -1813,6 +1814,7 @@ 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)
@@ -1825,6 +1827,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
 					}
 					
 				}
+
     }
     //验证是否重复
     self.repeat = false;

tpl/shouwenbg/WJCBD/js/formeditZW.js

@@ -1300,6 +1300,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
             if (self.data.DBSX == "") {
                 sp.dialog("督办时限不能为空！已为您设为来文日期后15天！")
                 self.data.DBSX = sp.getNextDate(self.data.LWRQ, 15);
+                self.data.CPSX = sp.getNextDate(self.data.LWRQ, 13);
                 return
             }
             if (self.data.SWBH1 == "") {