Merge branch 'master' of http://117.72.14.118:3000/ZYjames12345/zhujian_OA

tpl/SJPSDB/SJPSDB/js/formeditFL.js

@@ -485,7 +485,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
             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),
+								CPSX:res.data.SX_SJPSDU.CPSX == "" ? sp.dateCount(-1) : 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,
@@ -1721,7 +1721,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
     //发生修改
     self.changeFiled = function (str) {
         self.filedChange = true;
-        if (str = "XBCS") {
+        if (str == "XBCS") {
             self.XBCSROWS = Math.ceil(self.data.XBCS.length / 13) < 1 ? 1 : Math.ceil(self.data.XBCS.length / 13)
         }
 				

tpl/gongzi/js/list.js

@@ -48,7 +48,7 @@ app.controller("listCtrl", ["$scope", "$http", "$timeout", function ($scope, $ht
                 if (item.code != "ID" && item.code != "ROUTEINFOID" &&
                     item.code != "SORTID" && item.code != "APPCODE" &&
                     item.code != "CTIME" && item.code != "RYSF" && item.code != "RYFL" && item.code != "SFZHM" && item.code != "CJGZSJ" && item.code != "ZW") {
-                    self.thead.push({ code: item.code, cname: item.cname, ckind: item.ckind })
+                    self.thead.push({ code: item.code, cname: item.cname, ckind: item.ckind, show: false })
                 }
             })
             self.date = sp.currentYear() + "-" + formate(sp.currentMonth())
@@ -96,11 +96,17 @@ app.controller("listCtrl", ["$scope", "$http", "$timeout", function ($scope, $ht
                     });
                     self.list.forEach(function (item) {
                         self.thead.forEach(function (item1) {
+                            if (item[item1.code] != "" && item[item1.code] != null && item[item1.code] != undefined) {
+                                item1.show = true;
+                            }
                             if (item1.ckind == "datetime") {
                                 item[item1.code] = item[item1.code] ? sp.minsToDate("yyyy-MM", item[item1.code]) : "";
                             }
                             if (item.NAMETYPE == "合计") {
                                 item.XM = "合计";
+                                //if (item[item1.code] == "" || item[item1.code] == null || item[item1.code] == undefined) {
+                                //    item1.show = false;
+                                //}
                             }
                         })
                     })
@@ -130,6 +136,12 @@ app.controller("listCtrl", ["$scope", "$http", "$timeout", function ($scope, $ht
                             if (item1.ckind == "datetime") {
                                 item[item1.code] = sp.format(item[item1.code]).slice(0, 10)
                             }
+                            if (item[item1.code] != 0 && item[item1.code] != "" && item[item1.code] != null && item[item1.code] != undefined) {
+                                item1.show = true;
+                            }
+                            //if ((item1.ckind == "decimal" && item[item1.code] == 0) || item[item1.code] == "" || item[item1.code] == null | item[item1.code] == undefined) {
+                            //    item1.show = false;
+                            //}
                         })
                     })
                 }

tpl/gongzi/list.html

@@ -44,13 +44,13 @@
                                                 <thead>
                                                     <tr>
                                                         <th width="50">序号</th>
-                                                        <th style="min-width:100px" ng-repeat="item in ctl.thead" ng-bind="item.cname"></th>
+                                                        <th style="min-width:100px" ng-repeat="item in ctl.thead" ng-if="item.show" ng-bind="item.cname"></th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>
-                                                    <tr ng-repeat="item in ctl.list">
+                                                    <tr ng-repeat="item in ctl.list" ng-hide="item.NAMETYPE=='合计'">
                                                         <td ng-bind="$index+1"></td>
-                                                        <td ng-repeat="item1 in ctl.thead"><span title="{{item[item1.code]}}" ng-bind="item[item1.code]"></span></td>
+                                                        <td ng-repeat="item1 in ctl.thead" ng-if="item1.show"><span title="{{item[item1.code]}}" ng-bind="item[item1.code]"></span></td>
                                                     </tr>
                                                 </tbody>
                                             </table>

tpl/shixiangdb/SXDBD/js/formeditFL.js

@@ -506,6 +506,7 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
             self.data = {
                 ID: res.data.DCDB_SXDBD.ID,
                 APPCODE: res.data.DCDB_SXDBD.APPCODE,
+                CPSX: res.data.DCDB_SXDBD.CPSX == "" ? "" : sp.format(res.data.DCDB_SXDBD.CPSX),
                 BH: res.data.DCDB_SXDBD.BH == "" ? self.BH : res.data.DCDB_SXDBD.BH,
                 DBSX1: res.data.DCDB_SXDBD.DBSX1,
                 PSLD: res.data.DCDB_SXDBD.PSLD || '',
@@ -529,6 +530,17 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$interval", "$sc
                 FGLDSFTYBJ: res.data.DCDB_SXDBD.FGLDSFTYBJ == "" ? "" : res.data.DCDB_SXDBD.FGLDSFTYBJ,
                 SQRUSERID: res.data.DCDB_SXDBD.SQRUSERID == "" ? self.userId : res.data.DCDB_SXDBD.SQRUSERID,
             }
+            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: res.data.DCDB_SXDBD["CPSX.EREADONLY"] == "true",
                 BH: res.data.DCDB_SXDBD["BH.EREADONLY"] == "true",

tpl/wangzhaninfo/WZFBD/formedit.html

@@ -40,6 +40,18 @@
 </head>
 <body>
     <div ng-controller="formeditCtrl as ctl" id="app" ng-cloak>
+        <div class="sp-layer" id="newCreate" style="width: 1520px;">
+            <div class="sp-layer-head" style="background:#2176d6">
+                <div class="sp-page sp-text-center sp-font16">
+                    <div class="sp-layer-close" title="关闭" onclick="sp.closeCenter('.sp-layer')">
+                        ×
+                    </div>
+                </div>
+            </div>
+            <div class="sp-layer-body">
+                <iframe style="width:1500px;height:700px;border:0" ng-src="{{ctl.newCreatePdf}}"></iframe>
+            </div>
+        </div>
         <div class="wrapper wrapper-content">
             <div class="row">
                 <div class="col-md-12">

tpl/wangzhaninfo/WZFBD/js/formedit.js

@@ -23,8 +23,10 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
     self.get_lastReturnPage = sp.getUrlName("lastReturnPage");
     self.get_type = sp.getUrlName("type");
     self.return = "../list.html?lastReturnPageno=" + self.get_lastReturnPageno + "&type=" + self.get_type
+
+    self.newCreatePdf = apiurljs.login + "g2work/files2/inline/60a5fe2df36540ffe57aa29b7656c559/17369339517033f8dd719389c3256ac1e93ebbf59043a.pdf"
     
-		self.deviceType = localStorage.getItem("tjJxtGoldenlinkWork-deviceType");
+	self.deviceType = localStorage.getItem("tjJxtGoldenlinkWork-deviceType");
 
     var postCfg = {
         headers: {
@@ -563,7 +565,10 @@ app.controller("formeditCtrl", ["$scope", "$http", "$timeout", "$sce", function
     }
     //获取附件和插件
     self.getOther = function () {
-        if (self.routeinfoid == 0) { return }
+        if (self.routeinfoid == 0) {
+            sp.layer("#newCreate")
+            return
+        }
         var data = {
             tablename: "FILE_ATTACH",
             colums: "*",