Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
721e176e by weimo934
Options

style(规划审查待办已办):分页条看不见了

1 parent 76492a13
Inline Side-by-side
Showing 7 changed files with 176 additions and 984 deletions
...@@ -143,22 +143,6 @@ function postDataToServe(_url, _data, _fn, _async) { ...@@ -143,22 +143,6 @@ function postDataToServe(_url, _data, _fn, _async) {
143 function getApproveList(pageIndex, condition, starttimecondition, overtimecondition, typecondition) { 143 function getApproveList(pageIndex, condition, starttimecondition, overtimecondition, typecondition) {
144 layui.use('element', function () { 144 layui.use('element', function () {
145 var element = layui.element; 145 var element = layui.element;
146 /**
147 * $(this).ajaxStart(function(){
148 //parent.window.processBar.showBar();
149 parent.window.$.showLoading();
150 //微信loading hyh 新增 2017/10/27
151 //$.showLoading();
152
153 });
154
155 $(this).ajaxStop(function(){
156 //setTimeout(function() {parent.window.processBar.hideBar();}, 500);
157 //微信loading hyh 新增 2017/10/27
158 // setTimeout(function() {$.hideLoading()},1000);
159 parent.window.$.hideLoading();
160 });
161 * **/
162 currentPage = pageIndex; 146 currentPage = pageIndex;
163 if (searchInfo) { 147 if (searchInfo) {
164 condition = searchInfo; 148 condition = searchInfo;
...@@ -275,18 +259,6 @@ function getApproveList(pageIndex, condition, starttimecondition, overtimecondit ...@@ -275,18 +259,6 @@ function getApproveList(pageIndex, condition, starttimecondition, overtimecondit
275 } else { 259 } else {
276 zuiData(result); 260 zuiData(result);
277 } 261 }
278 // zuiData(result);
279
280 /*layuiPage(totalre);
281 if (totalre == 0){
282 $('#msg').css("display", "block");
283 $('#nvaTab').css("visibility", "hidden");
284 }else{
285 $('#msg').css("display", "none");
286 $('#nvaTab').css("visibility", "visible");
287 }*/
288 // parent.window.processBar.hideBar();
289
290 } 262 }
291 }); 263 });
292 264
...@@ -531,26 +503,12 @@ function zuiData(result) { ...@@ -531,26 +503,12 @@ function zuiData(result) {
531 if (orign === 'ghsc') { 503 if (orign === 'ghsc') {
532 //由于这块儿的过滤导致规划审查里的已办项目列表数据刷新不出来，暂时注释掉， 2020年6月2日 17:44:54 vers 504 //由于这块儿的过滤导致规划审查里的已办项目列表数据刷新不出来，暂时注释掉， 2020年6月2日 17:44:54 vers
533 data = data.filter(item => { 505 data = data.filter(item => {
534 // return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
535 // item.FLOWNAME.indexOf('申请数据流程') > -1 ||
536 // item.FLOWNAME.indexOf('项目策划生成') > -1 ||
537 // item.FLOWNAME.indexOf('数据申请') > -1
538 if (isType == 1) { 506 if (isType == 1) {
539 return item.FLOWNAME.indexOf('数据申请') > -1 507 return item.FLOWNAME.indexOf('数据申请') > -1
540 } else { 508 } else {
541 return item.FLOWNAME.indexOf('规划成果审查') > -1 /*|| 509 return item.FLOWNAME.indexOf('规划成果审查') > -1
542 item.FLOWNAME.indexOf('申请数据流程') > -1 ||
543 item.FLOWNAME.indexOf('项目策划生成') > -1*/
544 }; 510 };
545 511
546
547 // item.FLOWNAME === "建设项目工程建设许可" ||
548 // item.FLOWNAME === "建设项目立项用地规划许可审批" ||
549 // item.FLOWNAME === "施工许可阶段流程" ||
550 // item.FLOWNAME === "竣工验收阶段流程" ||
551 // item.FLOWNAME === "成果审查子流程测试" ||
552 // item.FLOWNAME === "出让类项目储备策划生成" ||
553 // item.FLOWNAME === '项目策划生成'
554 }) 512 })
555 } else if (orign === 'ywxt') { 513 } else if (orign === 'ywxt') {
556 data = data.filter(item => (item.FLOWNAME === "项目策划流程" || item.FLOWNAME === "项目储备策划生成")) 514 data = data.filter(item => (item.FLOWNAME === "项目策划流程" || item.FLOWNAME === "项目储备策划生成"))
...@@ -829,95 +787,6 @@ function openlayer_continue() { ...@@ -829,95 +787,6 @@ function openlayer_continue() {
829 } 787 }
830 } 788 }
831 789
832 /* hzw 2018/3/15 注释 不影响可以删除
833 //check box 勾选事件
834 function CheckItem(obj){
835 // $("input[type='checkbox']:checked").each(function(i){
836 // $(this).prop('checked','');
837 // });
838 canFinishFlow = true;
839 var checkBoxs = $("input[type='checkbox']:checked");
840 var tds = checkBoxs.parent().parent().find("td");
841 if(checkBoxs.length==0){
842 projectId = null;
843 taskIds = null;
844 canFinishFlow = false;
845 $("#continueProject").attr("disabled","disabled");
846 return ;
847 }
848 if(checkBoxs.length>1){
849 $("#continueProject").attr("disabled","disabled");
850 projectId = null;
851 var i = 0;
852 taskIds = '';
853 $("#continueProject").attr("disabled","disabled");
854 $("input[type='checkbox']:checked").each(function(i){
855 var tds = $(this).parent().parent().find("td");
856 if(tds[4].innerText!="退件")
857 canFinishFlow = false;
858 if(i==0){
859 taskIds += tds[3].innerText;
860 }else{
861 taskIds += ','+tds[3].innerText;
862 }
863 i++;
864 });
865 i = 0;
866 }else{
867 $("#continueProject").attr("disabled",null);
868 projectId = tds[1].innerText;
869 taskIds = tds[3].innerText;
870 if(tds[4].innerText!="退件")
871 canFinishFlow = false;
872 }
873 }
874 */
875
876 /**
877 * 日志
878 */
879
880 /* hzw 2018/3/15 注释 提取到layuiDataList.js作为通用方法 不影响可以删除
881 * function openJournal(){
882 var checboxnumber=0;
883 var checboxdata = [];
884 var myDatatable = $('table.datatable').data('zui.datatable');
885 var rowdata = myDatatable.data.rows;
886 for(var i=0;i<rowdata.length;i++){
887 if(rowdata[i].checked==true){
888 checboxnumber++;
889 var obj = rowdata[i];
890 checboxdata.push(obj);
891 }
892 }
893 if(checboxnumber==0){
894 parent.layer.msg("请选择项目！", {icon : 2});
895 }
896 if(checboxnumber>1){
897 parent.layer.msg("只能查看一个项目！", {icon : 2});
898 }
899
900 if(checboxdata.length==1){
901 var data = checboxdata[0];
902 var flowInstanceId = data.data[1].text;
903 var url = CONF_FRONT_SERVERURL + 'view/projecttask/flowlog.jsp?flowInstanceId='
904 + flowInstanceId;
905
906 layer.open({
907 type : 2, //page层
908 area : [ '70%', '90%' ],
909 offset : '10px',
910 title : '流程日志',
911 shadeClose : true,
912 shade : 0.6, //遮罩透明度
913 moveType : 1, //拖拽风格，0是默认，1是传统拖动
914 moveOut : true,
915 //shift: 1, //0-6的动画形式，-1不开启
916 content : url
917 });
918
919 }
920 }*/
921 function selectProjecType() { 790 function selectProjecType() {
922 var index = layer.open({ 791 var index = layer.open({
923 type: 2, 792 type: 2,
......
...@@ -8,11 +8,12 @@ var pageSize = 100; //瘥△暺恕蝷箇100嚗hy20181226靽格嚗蛹鈭 ...@@ -8,11 +8,12 @@ var pageSize = 100; //瘥△暺恕蝷箇100嚗hy20181226靽格嚗蛹鈭
8 8
9 let screenHeight = window.screen.height; 9 let screenHeight = window.screen.height;
10 var pageSizeLayui 10 var pageSizeLayui
11 if(screenHeight >= 1080) { 11 if (screenHeight >= 1080) {
12 pageSizeLayui = 18; // 18 12 pageSizeLayui = 18; // 18
13 }else { 13 } else {
14 pageSizeLayui = 10; 14 pageSizeLayui = 10;
15 }; 15 }
16 ;
16 17
17 var pageSizesLayui = [10, 15, 18, 30, 40, 50]; 18 var pageSizesLayui = [10, 15, 18, 30, 40, 50];
18 var currentLayui = 1; 19 var currentLayui = 1;
...@@ -44,7 +45,7 @@ var orign = null; // 皞 created by zys ...@@ -44,7 +45,7 @@ var orign = null; // 皞 created by zys
44 var isType = 2; // 默认数据申请 目前只在规划审查待办项目中 45 var isType = 2; // 默认数据申请 目前只在规划审查待办项目中
45 var isClickPage = false; 46 var isClickPage = false;
46 47
47 console.log('业务协同/规划审查js','webapp/js/projecttask/dealingproject.js') 48 console.log('业务协同/规划审查js', 'webapp/js/projecttask/dealingproject.js')
48 49
49 $(function () { 50 $(function () {
50 // FIXME: zys 51 // FIXME: zys
...@@ -58,9 +59,10 @@ $(function () { ...@@ -58,9 +59,10 @@ $(function () {
58 } 59 }
59 } 60 }
60 // 去掉tabs 61 // 去掉tabs
61 if(orign != 'ghsc') { 62 if (orign != 'ghsc') {
62 $('#isTabs').remove(); 63 $('#isTabs').remove();
63 }; 64 }
65 ;
64 if (orign === 'ghsc') { 66 if (orign === 'ghsc') {
65 $("#continueProject").remove(); 67 $("#continueProject").remove();
66 $("#createProject").html('<span class="glyphicon glyphicon-download-alt" style="font-size: 15px"></span><a class="bumpbox_white">新建</a>').show(); 68 $("#createProject").html('<span class="glyphicon glyphicon-download-alt" style="font-size: 15px"></span><a class="bumpbox_white">新建</a>').show();
...@@ -106,6 +108,7 @@ $(function () { ...@@ -106,6 +108,7 @@ $(function () {
106 108
107 window.onresize = setListHeight;//当窗口改变宽度时执行此函数,lhy20181226修改 109 window.onresize = setListHeight;//当窗口改变宽度时执行此函数,lhy20181226修改
108 function setListHeight() { 110 function setListHeight() {
111 debugger
109 var tableTop = parseInt($("#workingsTabDiv").offset().top) - 10; 112 var tableTop = parseInt($("#workingsTabDiv").offset().top) - 10;
110 // var tableTop = parseInt($("#tbodylist").offset().top)-10; 113 // var tableTop = parseInt($("#tbodylist").offset().top)-10;
111 var wh = $(window).height(); 114 var wh = $(window).height();
...@@ -113,7 +116,8 @@ function setListHeight() { ...@@ -113,7 +116,8 @@ function setListHeight() {
113 var iframeTop = window.parent.$("#iframecontent").offset().top; 116 var iframeTop = window.parent.$("#iframecontent").offset().top;
114 //$("#workingsTabDiv").css("height",wh-iframeTop-tableTop-bodyPadding+"px"); 117 //$("#workingsTabDiv").css("height",wh-iframeTop-tableTop-bodyPadding+"px");
115 var height = wh - iframeTop - tableTop - bodyPadding - 40;//50大概是tablehead的高度 118 var height = wh - iframeTop - tableTop - bodyPadding - 40;//50大概是tablehead的高度
116 $("#tbodylist").css("height", height + "px"); 119 //$("#tbodylist").css("height", height + "px");
120 $("#tbodylist").css("height", '80vh');
117 //$("#datalist").css("min-width",getTableInitWidth("datalist")+"px");//设置table的初始宽度 121 //$("#datalist").css("min-width",getTableInitWidth("datalist")+"px");//设置table的初始宽度
118 setTableMinWidth();//设置表格的最小宽度 122 setTableMinWidth();//设置表格的最小宽度
119 setCellWidth();//设置单元格宽度 123 setCellWidth();//设置单元格宽度
...@@ -151,127 +155,6 @@ function openlayer_type() { ...@@ -151,127 +155,6 @@ function openlayer_type() {
151 }); 155 });
152 } 156 }
153 157
154 /**
155 * 批量发送
156 */
157
158 /*function batchSendClick(){
159 var checboxdata = [];
160 var myDatatable = $('table.datatable').data('zui.datatable');
161 var rowdata = myDatatable.data.rows;
162 for(var i=0;i<rowdata.length;i++){
163 if(rowdata[i].checked==true){
164 var obj = rowdata[i];
165 var tid = obj.data[2].text
166 checboxdata.push(tid);
167 }
168 }
169 taskIds = checboxdata.join(",");
170 if(!taskIds){
171 layer.msg('请选择需要发送的项目',{icon:2});
172 return ;
173 }
174 var tid = taskIds.split(",")[0];
175 //校验是否为同一流程同一环节
176
177 $.ajax({
178 type: "POST",
179 url: curserver + global.modelctls.project.task.batchSend,
180 headers:{
181 "token":$.cookie('ftoken')
182 },
183 data:{taskIds:taskIds},
184 dataType: 'json',
185 success:function(data){
186 if(data.status=='ok'){
187 //批量发送
188 $.ajax({
189 type: "POST",
190 url: curserver + global.modelctls.project.task.resource,
191 headers:{
192 "token":$.cookie('ftoken')
193 },
194 data:{taskid : tid},
195 dataType: 'json',
196 success:function(data){
197 canSelfTurning=data.activity.canSelfTurning;
198 flowObjectName=data.activity.flowObjectName;
199 task = data.task;
200 activityid = data.activity.id;
201 }
202 });
203
204 var index = layer.open({
205 type : 2,
206 title : '选择用户',
207 shadeClose : true,
208 shade : 0.3,
209 area : [ '640px', '600px' ],
210 offset : [ '50px' ],
211 content : '../../view/userlist.jsp?taskId=' + tid,
212 btn : [ '发送', '取消' ],
213 yes : function(index, layero) {
214 var iframeWin = window[layero.find('iframe')[0]['name']];
215 var splabel = iframeWin.splabel();
216 var toArray = [];
217 for (var i = 0; i < splabel.length; i++) {
218 var item = splabel[i];
219 toArray.push({
220 id : item.id,
221 name : item.name,
222 users : item.user
223 });
224 }
225 var sendInfo = {
226 from : {
227 id : task.flowObjectId,
228 name : task.name+",发送"
229 },
230 to : toArray
231 };
232 $.ajax({
233 type: "POST",
234 url: curserver + global.modelctls.flowEngine.task.batchComplete,
235 headers:{
236 "token":$.cookie('ftoken')
237 },
238 data:{
239 taskIds : taskIds,
240 activityId: activityid,
241 sendObject : JSON.stringify(sendInfo)
242 },
243 dataType: 'json',
244 success:function(result){
245 if (result.status == 'ok') {
246 //发送短信微信
247 var tousers=iframeWin.users();
248 var checkMessage=iframeWin.checkMessage();
249 if(checkMessage!=""){
250 var content = iframeWin.dWxWconContent();
251 allSend(tousers,checkMessage,content);
252 }
253
254
255
256
257 layer.close(index);
258 } else {
259 console.info(result);
260 layer.msg('发送失败！',{icon:2});
261 }
262 }
263 });
264 },
265 end : function(index, layero) {
266
267 }
268 });
269
270 }else
271 layer.msg(data.message,{icon: 2});
272 }
273 });
274 }*/
275 158
276 function getdoctype() { 159 function getdoctype() {
277 return "batchsp"; 160 return "batchsp";
...@@ -286,39 +169,6 @@ function getcanSelfTurningData() { ...@@ -286,39 +169,6 @@ function getcanSelfTurningData() {
286 } 169 }
287 170
288 /** 171 /**
289 * 批量结束流程
290 *
291 */
292
293 /*function finishFlow(){
294 if(!taskIds){
295 layer.msg('请选择需要结束的项目',{icon:2});
296 return ;
297 }
298 if(!canFinishFlow){
299 layer.msg('所选择的项目包含非退件项目，无法结束',{icon:2});
300 return ;
301 }
302 layer.open({
303 content: '确定结束该项目吗？',
304 btn: ['确认', '取消'],
305 shadeClose: true,
306 icon: 3,
307 yes: function(){
308 var url = global.contextPath + global.modelctls.flowEngine.task.finishFlow;
309 $.post(url,{taskIds:taskIds},function(data){
310 if(data.status=='ok'){
311 layer.msg(data.message,{icon: 1});
312 getApproveList(1);
313 }else
314 layer.msg(data.message,{icon: 2});
315 });
316 }
317 });
318
319 }*/
320
321 /**
322 *显示流程日志 172 *显示流程日志
323 */ 173 */
324 function openlayer_flowlog() { 174 function openlayer_flowlog() {
...@@ -354,24 +204,6 @@ function sendToUsers() { ...@@ -354,24 +204,6 @@ function sendToUsers() {
354 }); 204 });
355 } 205 }
356 206
357 /**
358 * 已经不使用，下次没发现什么问题可删除 2018-01-08
359 */
360
361 /*function opendetailproject(obj){
362 var jqobj=$(obj);
363 var tds = jqobj.find("td");
364 var taskid = tds[3].innerText;
365 var title = tds[6].innerText;
366 var titleEncode = encodeURI(encodeURI(title));
367 var stats = "projecting";
368 var url = CONF_FRONT_SERVERURL + 'view/projecttask/detailproject.jsp?taskId=' + taskid+"&stats="+stats+"&titleEncode="+titleEncode;
369 //打开后修改样式,修改未读样式
370 var obj_div=$(obj).css("font-weight","");
371 //window.open(url);
372 parent.saveOpenNew(window.open(url)); //hyh 修改 2017/11/6
373 }*/
374
375 207
376 /** 208 /**
377 * 根据获取到的权限判断时候拥有列表显示的权限 209 * 根据获取到的权限判断时候拥有列表显示的权限
...@@ -421,10 +253,10 @@ function getApproveList(pageIndex, condition, starttimecondition, ...@@ -421,10 +253,10 @@ function getApproveList(pageIndex, condition, starttimecondition,
421 var projectTypes = $('#projectTypes').val(); 253 var projectTypes = $('#projectTypes').val();
422 var list = '/dblb/list/workings'; 254 var list = '/dblb/list/workings';
423 var username = null; 255 var username = null;
424 if(username == '' || username == null || username == "undefined"){ 256 if (username == '' || username == null || username == "undefined") {
425 username = userInfo.user.loginname; 257 username = userInfo.user.loginname;
426 } 258 }
427 if(username == '' || username == null || username == "undefined"){ 259 if (username == '' || username == null || username == "undefined") {
428 username = "申请者"; 260 username = "申请者";
429 } 261 }
430 $.ajax({ 262 $.ajax({
...@@ -455,7 +287,7 @@ function getApproveList(pageIndex, condition, starttimecondition, ...@@ -455,7 +287,7 @@ function getApproveList(pageIndex, condition, starttimecondition,
455 287
456 }, 288 },
457 success: function (res) { 289 success: function (res) {
458 if (res.code===500){ 290 if (res.code === 500) {
459 $('#msg').css("display", "block"); 291 $('#msg').css("display", "block");
460 $('#nvaTab').css("visibility", "hidden"); 292 $('#nvaTab').css("visibility", "hidden");
461 return false 293 return false
...@@ -505,40 +337,6 @@ function srollPage(pageIndex, nDivHight) { ...@@ -505,40 +337,6 @@ function srollPage(pageIndex, nDivHight) {
505 337
506 } 338 }
507 339
508
509 /* hzw 2018/3/15 注释 不影响可以删除
510 * var zuidate = {
511 cols: [
512 {width: 'auto', text: '项目id', type: 'number', flex: false, colClass: 'hidden'},
513 {width: 'auto', text: '流程id', type: 'number', flex: false, colClass: 'hidden'},
514 {width: 'auto', text: '实例id', type: 'number', flex: false, colClass: 'hidden'},
515 {width: '40', text: '<img src="../../image/projecttask/projecttaskinfo.png "style="width:16px;">',type: 'string', flex: false,sort:false},//hyh 修改,给图标一栏的头部加个图标 2017/10/23
516 {width: '70', text: '状态', type: 'string', flex: false, colClass: '',sort:false},
517 {width: '100', text: '当前环节', type: 'string', flex: false, colClass: '',sort:false },
518 {width: 'auto', text: '项目类型', type: 'string', flex: false,colClass: '',sort:false},
519 {width: '200', text: '项目编号', type: 'number', flex: false, colClass: '',sort:false},
520 {width: 'auto', text: '项目名称', type: 'string', flex: false, colClass: '',sort:false },
521 {width: 'auto', text: '建设单位', type: 'string', flex: false,colClass: '',sort:false },
522 {width: 'auto', text: '主办科室 ', type: 'string', flex: false,colClass: '',sort:false },
523 {width: '100', text: '主办人', type: 'string', flex: false,colClass: '',sort:false },
524 {width: 'auto', text: '接件日期', type: 'date', flex: false,colClass: '',sort:true },
525 {width: '100', text: '理论办结日期', type: 'date', flex: false,sort:false}
526 // {width: '180', text: '<img src="../assets/images/projecttask/operation.png" style="width:20px;height:20px;margin-right:10px;">操作', type: 'string',flex: false,sort:false}
527 // ,],
528 rows:[]
529 }*/
530
531
532 /* hzw 2018/3/15 注释 不影响可以删除
533 * function zuitable(){
534 $('table.datatable').datatable({
535 checkable: true,
536 sortable: true,
537 checkByClickRow:false,
538 minFixedLeftWidth: 300,
539 });
540 }*/
541
542 var dataTable = []; 340 var dataTable = [];
543 341
544 function dealingProjectDate(result, condition) { 342 function dealingProjectDate(result, condition) {
...@@ -595,27 +393,27 @@ function dealingProjectDate(result, condition) { ...@@ -595,27 +393,27 @@ function dealingProjectDate(result, condition) {
595 var XMLX = map_result["XMLX"] ? map_result["XMLX"] : ""; 393 var XMLX = map_result["XMLX"] ? map_result["XMLX"] : "";
596 console.log(XMLX); 394 console.log(XMLX);
597 var yt = null; 395 var yt = null;
598 if(map_result["YT"] == "-"){ 396 if (map_result["YT"] == "-") {
599 yt = ""; 397 yt = "";
600 }else{ 398 } else {
601 yt = map_result["YT"]; 399 yt = map_result["YT"];
602 } 400 }
603 var mj = null; 401 var mj = null;
604 if(map_result["MJ"] == "-" || map_result["MJ"] == "请选择"){ 402 if (map_result["MJ"] == "-" || map_result["MJ"] == "请选择") {
605 mj = " "; 403 mj = " ";
606 }else if(map_result["MJ"] == "1"){ 404 } else if (map_result["MJ"] == "1") {
607 mj = "公开"; 405 mj = "公开";
608 }else if(map_result["MJ"] == "2"){ 406 } else if (map_result["MJ"] == "2") {
609 mj = "秘密"; 407 mj = "秘密";
610 }else if(map_result["MJ"] == "3"){ 408 } else if (map_result["MJ"] == "3") {
611 mj = "机密"; 409 mj = "机密";
612 }else if(map_result["MJ"] == "4"){ 410 } else if (map_result["MJ"] == "4") {
613 mj = "绝密"; 411 mj = "绝密";
614 } 412 }
615 var xzqhbsm = null; 413 var xzqhbsm = null;
616 if(map_result["XZQHBSM"] == "-" || map_result["XZQHBSM"] == "请选择"){ 414 if (map_result["XZQHBSM"] == "-" || map_result["XZQHBSM"] == "请选择") {
617 xzqhbsm = ""; 415 xzqhbsm = "";
618 }else{ 416 } else {
619 xzqhbsm = map_result["XZQHBSM"]; 417 xzqhbsm = map_result["XZQHBSM"];
620 } 418 }
621 //因为 审批列表使用的是zui组件，所以无法更换 419 //因为 审批列表使用的是zui组件，所以无法更换
...@@ -694,12 +492,12 @@ function dealingProjectDate(result, condition) { ...@@ -694,12 +492,12 @@ function dealingProjectDate(result, condition) {
694 "ATTACHPATH": attachpath, 492 "ATTACHPATH": attachpath,
695 "TASK_DEF_KEY_": taskkey, 493 "TASK_DEF_KEY_": taskkey,
696 "FLOWITEMTYPE": flowItemType, 494 "FLOWITEMTYPE": flowItemType,
697 "CGBBH":cgbbh, 495 "CGBBH": cgbbh,
698 "YT":yt, 496 "YT": yt,
699 "MJ":mj ? mj : '', 497 "MJ": mj ? mj : '',
700 "XZQHBSM":xzqhbsm, 498 "XZQHBSM": xzqhbsm,
701 "SPJD":SPJD, 499 "SPJD": SPJD,
702 "XMLX":XMLX 500 "XMLX": XMLX
703 } 501 }
704 data.push(row); 502 data.push(row);
705 listShowObject.push(row); 503 listShowObject.push(row);
...@@ -714,12 +512,6 @@ function dealingProjectDate(result, condition) { ...@@ -714,12 +512,6 @@ function dealingProjectDate(result, condition) {
714 512
715 } 513 }
716 514
717 /* hzw 2018/3/15 注释 不影响可以删除
718 * function openRefreshList(){
719 zuidate.rows = [];
720 $('table.datatable').datatable('load',getApproveList(1));
721 }*/
722
723 515
724 //check box 勾选事件 516 //check box 勾选事件
725 function CheckItem(obj) { 517 function CheckItem(obj) {
...@@ -765,74 +557,7 @@ function CheckItem(obj) { ...@@ -765,74 +557,7 @@ function CheckItem(obj) {
765 } 557 }
766 } 558 }
767 559
768 /**
769 * 动态分页按钮
770 * @param tatalre
771 * @param totalpa
772 */
773 /* hzw 2018/3/15 注释 不影响可以删除
774 * function dynamicPage(totalre,totalpa,currentPage){
775 $("#total_records").html(totalre);
776 $("#total_page").html(totalpa);
777 var pageStart = "";
778 var pageEnd = "";
779 if(currentPage<=Math.round(pageNum/2)+1){
780 pageStart = 1;
781 pageEnd = pageNum;
782 }
783 if(currentPage>Math.round(pageNum/2)+1){
784 pageStart = currentPage-Math.round(pageNum/2);
785 pageEnd = currentPage+Math.round(pageNum/2)-2;
786 }
787 if(pageEnd>totalpa){
788 pageEnd = totalpa;
789 }
790 var ulcontent = $(".pagination");
791 ulcontent.children().filter('li').remove();
792 ulcontent.append("<li> <a onclick=\"jumpPage(0)\" aria-label=\"Previous\">" +
793 "<span aria-hidden=\"true\">上一页</span></a></li> ");
794 for(var i=pageStart;i<=pageEnd;i++){
795 if(i==currentPage){
796 ulcontent.append("<li class=\"active\"><a onclick=\"getApproveList("+i+")\">"+i+"</a></li>");
797 }else{
798 ulcontent.append("<li><a onclick=\"getApproveList("+i+")\">"+i+"</a></li>");
799 }
800
801 }
802 ulcontent.append("<li> <a onclick=\"jumpPage(1)\" aria-label=\"Next\">" +
803 "<span aria-hidden=\"true\">下一页</span></a></li> ");
804 pagging.modifyPagging(totalre, totalpa,currentPage);
805 }*/
806 pagging.config.list = getApproveList; 560 pagging.config.list = getApproveList;
807 /**
808 * 上一页、下一页调转
809 * @param index
810 */
811
812 /* hzw 2018/3/15 注释 不影响可以删除
813 * function jumpPage(index){
814 var pageindex=1;
815 if(index==0){//上一页
816 pageindex = currentPage-1<=1?1:currentPage-1;
817 }else {
818 pageindex= currentPage+1>=totalpage?totalpage:currentPage+1;
819 }
820 getApproveList(pageindex);
821 }
822
823 function newTab(url, tabname, tabid){
824 window.parent.iframeLoad(url, tabname, tabid);
825 }
826
827 function refreshTable(){
828 zuidate.rows = [];
829 $('table.datatable').datatable('load',getApproveList(1));
830 }
831 function checkboxStop(){
832 $("input[type='checkbox']").click(function(e){
833 e.stopPropagation();
834 });
835 }*/
836 561
837 /** 562 /**
838 * 上会 563 * 上会
...@@ -1226,87 +951,6 @@ function openlayer_tree() { ...@@ -1226,87 +951,6 @@ function openlayer_tree() {
1226 951
1227 952
1228 /** 953 /**
1229 * 结束流程
1230 */
1231
1232 /*function openlayer_endtask(){
1233 var taskArray=[];
1234 var projectids =[];
1235 var myDatatable = $('table.datatable').data('zui.datatable');
1236 var rowdata = myDatatable.data.rows;
1237 for(var i=0;i<rowdata.length;i++){
1238 if(rowdata[i].checked==true){
1239 var obj = rowdata[i];
1240 var taskid = obj.data[2].text
1241 if(obj.data[4].text != '退件'){
1242 parent.layer.msg("结束失败！只有状态为'退件'的案件才可以结束！", {icon : 2});
1243 return false ;
1244 }else{
1245 taskArray.push(taskid);
1246 projectids.push(obj.data[0].text);
1247 }
1248 }
1249 }
1250 if(taskArray!=null && taskArray.length>0){
1251 parent.layer.open({
1252 content: '确定结束选中流程吗？',
1253 btn: ['确认', '取消'],
1254 shadeClose: true,
1255 icon: 3,
1256 yes: function(){
1257 var taskString = taskArray.join();
1258 $.ajax({
1259 type: "POST",
1260 url: curserver + global.modelctls.flowEngine.task.finishFlow,
1261 headers:{
1262 "token":$.cookie('ftoken')
1263 },
1264 data:{
1265 taskIds : taskString,
1266 },
1267 success:function(result){
1268 if(result.status == 'ok') {
1269 action = "退件办结";
1270 for(var i=0;i<projectids.length;i++){
1271 projectid = projectids[i];
1272 updateActionStatus();
1273 }
1274 var taskListArray=[];
1275 var taskList=result.data;
1276 for(var i=0;i<taskList.length;i++){
1277 taskListArray.push(taskList[i].instanceId);
1278
1279 }
1280 if(taskListArray!=null){
1281 $.ajax({
1282 type: "POST",
1283 url: curserver + global.modelctls.project.updateProjectTwo,
1284 headers:{
1285 "token":$.cookie('ftoken')
1286 },
1287 data:{
1288 taskList : taskListArray.join()
1289 },
1290 dataType: 'json',
1291 success:function(msg){
1292 }
1293 });
1294 }
1295 parent.layer.msg(result.message,{icon: 1});
1296 //openRefreshList();
1297 }
1298 }
1299 });
1300 parent.layer.closeAll();
1301 }
1302 });
1303 }else{
1304 parent.layer.msg("请选择项目！", {icon : 2});
1305 }
1306 }*/
1307
1308
1309 /**
1310 * TEST 954 * TEST
1311 * 日志 955 * 日志
1312 */ 956 */
...@@ -1477,7 +1121,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1477,7 +1121,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1477 if (orign === 'ghsc') { 1121 if (orign === 'ghsc') {
1478 // -- 规划审查 待办项目 1122 // -- 规划审查 待办项目
1479 //添加表头 1123 //添加表头
1480 if(isType == 1) { 1124 if (isType == 1) {
1481 // -- 数据申请 根据类型切换表头 1125 // -- 数据申请 根据类型切换表头
1482 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" + 1126 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
1483 "<thead><tr class=\"tabletitle\"> " + 1127 "<thead><tr class=\"tabletitle\"> " +
...@@ -1496,7 +1140,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1496,7 +1140,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1496 "</tr>" + 1140 "</tr>" +
1497 "</thead>" + 1141 "</thead>" +
1498 "<tbody id=\"tbodylist\">" 1142 "<tbody id=\"tbodylist\">"
1499 }else { 1143 } else {
1500 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" + 1144 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
1501 "<thead><tr class=\"tabletitle\"> " + 1145 "<thead><tr class=\"tabletitle\"> " +
1502 "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" + 1146 "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
...@@ -1513,7 +1157,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1513,7 +1157,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1513 "<th width=\"11%\"><div class=\"tableCell\">报送时间</div></th>" + 1157 "<th width=\"11%\"><div class=\"tableCell\">报送时间</div></th>" +
1514 "</tr>" + 1158 "</tr>" +
1515 "</thead>" + 1159 "</thead>" +
1516 "<tbody id=\"tbodylist\">" 1160 "<tbody id=\"tbodylist\" style='height: 80vh !important;'>"
1517 } 1161 }
1518 1162
1519 // -- 筛选数据逻辑 1163 // -- 筛选数据逻辑
...@@ -1521,12 +1165,13 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1521,12 +1165,13 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1521 // return item.FLOWNAME.indexOf('规划成果审查') > -1 || 1165 // return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
1522 // item.FLOWNAME.indexOf('申请数据流程') > -1 || 1166 // item.FLOWNAME.indexOf('申请数据流程') > -1 ||
1523 // item.FLOWNAME.indexOf('数据申请') > -1 1167 // item.FLOWNAME.indexOf('数据申请') > -1
1524 if(isType == 1) { 1168 if (isType == 1) {
1525 return item.FLOWNAME.indexOf('数据申请') > -1 1169 return item.FLOWNAME.indexOf('数据申请') > -1
1526 }else { 1170 } else {
1527 return item.FLOWNAME.indexOf('规划成果审查') > -1 || 1171 return item.FLOWNAME.indexOf('规划成果审查') > -1 ||
1528 item.FLOWNAME.indexOf('申请数据流程') > -1 1172 item.FLOWNAME.indexOf('申请数据流程') > -1
1529 }; 1173 }
1174 ;
1530 }); 1175 });
1531 // -- 分页逻辑单独抽出 1176 // -- 分页逻辑单独抽出
1532 if (createdFlag || isClickPage) { 1177 if (createdFlag || isClickPage) {
...@@ -1535,14 +1180,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1535,14 +1180,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1535 createPage(data); 1180 createPage(data);
1536 } 1181 }
1537 1182
1538 // 分页没有被创建 并且 数据量大于 分页条数 才显示分页
1539 // if(createdFlag && data.length > pageSizeLayui) {
1540 // createPage(data);
1541 // createdFlag = false;
1542 // };
1543 var _url = '/xm/getLcList'; 1183 var _url = '/xm/getLcList';
1544 // var user = JSON.parse(parent.userCookies).user; 1184 // var user = JSON.parse(parent.userCookies).user;
1545 var user={ 1185 var user = {
1546 id: "t0101_8a8610de737b99270173941e5c50017e", 1186 id: "t0101_8a8610de737b99270173941e5c50017e",
1547 loginname: "案件查处", 1187 loginname: "案件查处",
1548 realname: "案件查处", 1188 realname: "案件查处",
...@@ -1571,9 +1211,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1571,9 +1211,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1571 }, false); 1211 }, false);
1572 data.forEach((ele) => { 1212 data.forEach((ele) => {
1573 // -- REGISTERTIME 用rwjssj来 转化为时间戳 处理排序 1213 // -- REGISTERTIME 用rwjssj来 转化为时间戳 处理排序
1574 if(ele.REGISTERTIME) { 1214 if (ele.REGISTERTIME) {
1575 ele.timeStampVal = (new Date(ele.REGISTERTIME)).getTime(); 1215 ele.timeStampVal = (new Date(ele.REGISTERTIME)).getTime();
1576 }else { 1216 } else {
1577 ele.timeStampVal = 0; 1217 ele.timeStampVal = 0;
1578 } 1218 }
1579 }); 1219 });
...@@ -1591,7 +1231,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1591,7 +1231,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1591 1231
1592 var _url = '/xm/getLcList'; 1232 var _url = '/xm/getLcList';
1593 // var user = JSON.parse(parent.userCookies).user; 1233 // var user = JSON.parse(parent.userCookies).user;
1594 var user={ 1234 var user = {
1595 id: "t0101_8a8610de737b99270173941e5c50017e", 1235 id: "t0101_8a8610de737b99270173941e5c50017e",
1596 loginname: "案件查处", 1236 loginname: "案件查处",
1597 realname: "案件查处", 1237 realname: "案件查处",
...@@ -1606,33 +1246,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1606,33 +1246,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1606 userName: user.realname, 1246 userName: user.realname,
1607 }; 1247 };
1608 1248
1609 // data = data.filter(item => (
1610 // item.FLOWNAME.indexOf('规划成果审查') > -1 ||
1611 // item.FLOWNAME.indexOf('申请数据流程') > -1
1612 // ));
1613 // // --
1614 // if(createdFlag) {
1615 // createPage(data);
1616 // createdFlag = false;
1617 // };
1618 //
1619 // var pageData = data.slice((currentLayui - 1) * pageSizeLayui, (currentLayui - 1) * pageSizeLayui + pageSizeLayui);
1620
1621 // 优化调用 --
1622 // postDataToServe(_url, {..._obj, pageData: JSON.stringify(pageData)}, res => {
1623 // for (var i = 0; i < pageData.length; i++) {
1624 // for (var j = 0; j < res.length; j++) {
1625 // if (pageData[i].PROJECTID == res[j].id) {
1626 // pageData[i].REGISTERTIME = res[j].rwjssj
1627 // pageData[i].PROJECTNAME = res[j].xmmc || ""
1628 // pageData[i].PROJECTCODE = res[j].xmbh || ""
1629 // pageData[i].BINDINGASSIGNEE = res[j].jbr || ""
1630 // pageData[i].BINDINGUNIT = res[j].bm || ""
1631 // }
1632 // }
1633 // }
1634 // }, false);
1635
1636 for (var j = 0; j < pageData.length; j++) {//遍历所有项目数据 1249 for (var j = 0; j < pageData.length; j++) {//遍历所有项目数据
1637 var flowTypeStr = pageData[j]["PROJECTFLOWTYPE"]; 1250 var flowTypeStr = pageData[j]["PROJECTFLOWTYPE"];
1638 var obj = JSON.stringify(pageData[j]); 1251 var obj = JSON.stringify(pageData[j]);
...@@ -1640,68 +1253,65 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1640,68 +1253,65 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1640 var descrption = pageData[j]["DESCRIPTION"]; 1253 var descrption = pageData[j]["DESCRIPTION"];
1641 if (descrption != "read") { 1254 if (descrption != "read") {
1642 fontweight = ' style=\"font-weight: 600;color: blue;\" '; 1255 fontweight = ' style=\"font-weight: 600;color: blue;\" ';
1643 }; 1256 }
1257 ;
1644 //状态-项目编号-项目名称-业务类型-发起部门-接受日期 1258 //状态-项目编号-项目名称-业务类型-发起部门-接受日期
1645 if (flowType == flowTypeStr) { 1259 if (flowType == flowTypeStr) {
1646 if(isType == 1) { 1260 if (isType == 1) {
1647 // 数据申请 1261 // 数据申请
1648 htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' + 1262 htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
1649 "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" + 1263 "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
1650 "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" + 1264 "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
1651 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" + 1265 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
1652 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" + 1266 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
1653 1267
1654 // -- 数据类型 1268 // -- 数据类型
1655 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" + 1269 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] + "><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
1656 // -- 数据用途 暂无字段 1270 // -- 数据用途 暂无字段
1657 "<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["YT"] +"><div class=\"tableCell\">" + pageData[j]["YT"] + "</div></td>" + 1271 "<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["YT"] + "><div class=\"tableCell\">" + pageData[j]["YT"] + "</div></td>" +
1658 1272
1659 // -- 密级 暂无字段 1273 // -- 密级 暂无字段
1660 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["MJ"] +"><div class=\"tableCell\">" + pageData[j]["MJ"] + "</div></td>" + 1274 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["MJ"] + "><div class=\"tableCell\">" + pageData[j]["MJ"] + "</div></td>" +
1661 // -- 项目版本 1275 // -- 项目版本
1662 // "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + '' +"><div class=\"tableCell\">" + '' + "</div></td>" + 1276 // "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + '' +"><div class=\"tableCell\">" + '' + "</div></td>" +
1663 1277
1664 // -- 当前环节 1278 // -- 当前环节
1665 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] +"><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" + 1279 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] + "><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
1666 1280
1667 // -- 申请部门 1281 // -- 申请部门
1668 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" + 1282 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] + "><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
1669 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["FLOWNAME"] + "</div></td>" + 1283 `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
1670 // "<td width=\"8%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["BINDINGUNIT"] + "</div></td>" +
1671 // "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["REGISTERTIME"] +"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" + // REGISTERTIME RECEIVETIME
1672 `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
1673 1284
1674 "</tr>"; 1285 "</tr>";
1675 }else { 1286 } else {
1676 // 成果审查 1287 // 成果审查
1677 htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' + 1288 htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
1678 "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" + 1289 "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
1679 "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" + 1290 "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
1680 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" + 1291 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
1681 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" + 1292 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
1682 1293
1683 // -- 规划类型 1294 // -- 规划类型
1684 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XMLX"] +"><div class=\"tableCell\">" + pageData[j]["XMLX"] + "</div></td>" + 1295 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XMLX"] + "><div class=\"tableCell\">" + pageData[j]["XMLX"] + "</div></td>" +
1685 "<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" + 1296 "<td width=\"30%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] + "><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" +
1686 1297
1687 // -- 行政辖区 1298 // -- 行政辖区
1688 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XZQHBSM"] +"><div class=\"tableCell\">" + pageData[j]["XZQHBSM"] + "</div></td>" + 1299 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["XZQHBSM"] + "><div class=\"tableCell\">" + pageData[j]["XZQHBSM"] + "</div></td>" +
1689 // -- 项目版本 1300 // -- 项目版本
1690 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["CGBBH"] +"><div class=\"tableCell\">" + pageData[j]["CGBBH"] + "</div></td>" + 1301 "<td width=\"5%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["CGBBH"] + "><div class=\"tableCell\">" + pageData[j]["CGBBH"] + "</div></td>" +
1691 1302
1692 // -- 当前环节 1303 // -- 当前环节
1693 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] +"><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" + 1304 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["ACTIVITYNAME"] + "><div class=\"tableCell\">" + pageData[j]["ACTIVITYNAME"] + "</div></td>" +
1694 // -- 所属阶段 1305 // -- 所属阶段
1695 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["SPJD"] +"><div class=\"tableCell\">" + pageData[j]["SPJD"] + "</div></td>" + 1306 "<td width=\"10%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["SPJD"] + "><div class=\"tableCell\">" + pageData[j]["SPJD"] + "</div></td>" +
1696
1697 1307
1698 1308
1699 // -- 发起部门 1309 // -- 发起部门
1700 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" + 1310 "<td width=\"8%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] + "><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
1701 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["FLOWNAME"] + "</div></td>" + 1311 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["FLOWNAME"] + "</div></td>" +
1702 // "<td width=\"8%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["BINDINGUNIT"] + "</div></td>" + 1312 // "<td width=\"8%\" onclick=\'workingSeeDetail(this)\'><div class=\"tableCell\">" + data[j]["BINDINGUNIT"] + "</div></td>" +
1703 // "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title`=" + pageData[j]["REGISTERTIME"]+"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" + 1313 // "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title`=" + pageData[j]["REGISTERTIME"]+"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" +
1704 `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` + 1314 `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
1705 1315
1706 "</tr>"; 1316 "</tr>";
1707 } 1317 }
...@@ -1736,14 +1346,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1736,14 +1346,9 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1736 "<th width=\"6%\"><div class=\"tableCell\">来件人</div></th>" + 1346 "<th width=\"6%\"><div class=\"tableCell\">来件人</div></th>" +
1737 "<th width=\"6%\"><div class=\"tableCell\">登记时间</div></th>" + 1347 "<th width=\"6%\"><div class=\"tableCell\">登记时间</div></th>" +
1738 "<th width=\"11%\"><div class=\"tableCell\">接受时间</div></th>" + 1348 "<th width=\"11%\"><div class=\"tableCell\">接受时间</div></th>" +
1739 // "<th width=\"10%\"><div class=\"tableCell\">当前环节</div></th>" +
1740 // "<th width=\"7%\"><div class=\"tableCell\">接收时间</div></th>" +
1741 // "<th width=\"5%\"><div class=\"tableCell\">经办人</div></th>" +
1742 // "<th width=\"7%\"><div class=\"tableCell\">所属部门</div></th>" +
1743 // "<th width=\"7%\"><div class=\"tableCell\">策划结论</div></th>" +
1744 "</tr>" + 1349 "</tr>" +
1745 "</thead>" + 1350 "</thead>" +
1746 "<tbody id=\"tbodylist\">" 1351 "<tbody id=\"tbodylist\" style='height: 80vh !important;'>"
1747 1352
1748 for (var i = 0; i < groupData.length; i++) {//遍历分组数据 1353 for (var i = 0; i < groupData.length; i++) {//遍历分组数据
1749 /*if(i>0){//TODO 测试 1354 /*if(i>0){//TODO 测试
...@@ -1761,11 +1366,12 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1761,11 +1366,12 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1761 if (createdFlag && isClickPage) { 1366 if (createdFlag && isClickPage) {
1762 createPage(data); 1367 createPage(data);
1763 createdFlag = false; 1368 createdFlag = false;
1764 }; 1369 }
1370 ;
1765 data.forEach((ele, index) => { 1371 data.forEach((ele, index) => {
1766 if(ele.RECEIVETIME) { 1372 if (ele.RECEIVETIME) {
1767 ele.timeStampVal = (new Date(ele.RECEIVETIME)).getTime(); 1373 ele.timeStampVal = (new Date(ele.RECEIVETIME)).getTime();
1768 }else { 1374 } else {
1769 ele.timeStampVal = 0; 1375 ele.timeStampVal = 0;
1770 } 1376 }
1771 }); 1377 });
...@@ -1809,166 +1415,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -1809,166 +1415,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
1809 htmlTable += htmlTableHeadTr + htmlTableBodyTr; 1415 htmlTable += htmlTableHeadTr + htmlTableBodyTr;
1810 1416
1811 } 1417 }
1812 } 1418 } else if (orign == 'phgl') {
1813
1814 /*
1815 * 业务协同项目审批页面
1816 * */
1817 // else if (orign === 'ywxt-xmsp' || orign === 'ywxt-all') {
1818 // // 业务协同 代办项目 --
1819 // // $("#ywxt-xmsp-tabs").show();
1820 // // $("#workingsTabDiv").css('margin-top', '-15px');
1821 // //添加表头
1822 // htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
1823 // "<thead><tr class=\"tabletitle\"> " +
1824 // "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
1825 // "<th width=\"3%\" class=\"statusIcon\"></th>" +
1826 // "<th width=\"5%\"><div class=\"tableCell\">状态</div></th>" +
1827 // "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
1828 // "<th width=\"20%\"><div class=\"tableCell\">项目名称</div></th> " +
1829 // "<th width=\"12%\"><div class=\"tableCell\">业务类型</div></th>" +
1830 // "<th width=\"7%\"><div class=\"tableCell\">发起部门</div></th>" +
1831 // "<th width=\"11%\"><div class=\"tableCell\">接收时间</div></th>" +
1832 // "</tr>" +
1833 // "</thead>" +
1834 // "<tbody id=\"tbodylist\">"
1835 //
1836 // for (var i = 0; i < groupData.length; i++) {//遍历分组数据
1837 // /*if(i>0){//TODO 测试
1838 // break;
1839 // }*/
1840 // var flowType = groupData[i]["type"];
1841 // var flowTypeName = groupData[i]["name"];
1842 // var sum = 0;//统计属于该类型的项目个数
1843 // var htmlTableBodyTr = "";//归类项目内容
1844 //
1845 // // -- ↓
1846 // data = data.filter(item => (
1847 // item.FLOWNAME === "工程建设许可阶段并联审批" ||
1848 // item.FLOWNAME === "立项用地规划许可阶段并联审批" ||
1849 // item.FLOWNAME === "施工许可阶段并联审批" ||
1850 // item.FLOWNAME === "竣工验收阶段并联审批" ||
1851 // item.FLOWNAME === "成果审查子流程测试" ||
1852 // item.FLOWNAME === "项目储备策划生成" ||
1853 // item.FLOWNAME === "出让类项目储备策划生成" ||
1854 // item.FLOWNAME==='项目策划生成（政府投资工程建设项目类）'||
1855 // item.FLOWNAME==='项目策划生成（企业投资项目用地储备类）'
1856 // // || item.FLOWNAME === "数据申请"
1857 // ));
1858 //
1859 // if (createdFlag) {
1860 // createPage(data);
1861 // createdFlag = false;
1862 // }
1863 // ;
1864 // data.forEach((ele) => {
1865 // if(ele.RECEIVETIME) {
1866 // ele.timeStampVal = (new Date(ele.REGISTERTIME)).getTime();
1867 // }else {
1868 // ele.timeStampVal = 0;
1869 // }
1870 // });
1871 // ownSort(data);
1872 // pageData = data.slice((currentLayui - 1) * pageSizeLayui, (currentLayui - 1) * pageSizeLayui + pageSizeLayui);
1873 //
1874 // var dataCopy = JSON.parse(JSON.stringify(pageData))
1875 // var _url = '/xm/getLcList';
1876 // var user = JSON.parse(parent.userCookies).user;
1877 // var _obj = {
1878 // userId: user.id,
1879 // userName: user.realname,
1880 //
1881 // };
1882 // postDataToServe(_url, {..._obj, data: JSON.stringify(pageData)}, res => {
1883 // for (var i = 0; i < pageData.length; i++) {
1884 // for (var j = 0; j < res.length; j++) {
1885 // if (pageData[i].PROJECTID == res[j].id) {
1886 // pageData[i].REGISTERTIME = res[j].rwjssj
1887 // pageData[i].PROJECTNAME = res[j].xmmc || ""
1888 // pageData[i].PROJECTCODE = res[j].xmbh || ""
1889 // pageData[i].BINDINGASSIGNEE = res[j].jbr || ""
1890 // pageData[i].ZPMSPH = res[j].cbbh || ""
1891 // pageData[i].BUILDADDRESS = res[j].jsdw || ""
1892 // pageData[i].CASECODE = res[j].jsdd || ""
1893 // pageData[i].BINDINGUNIT = res[j].bm || ""
1894 // pageData[i].SPJD = res[j].SPJD || ""
1895 //
1896 // if (pageData[i].ACTIVITYNAME === '发起项目' ||
1897 // pageData[i].ACTIVITYNAME === '预选址及审核' ||
1898 // pageData[i].ACTIVITYNAME === '空间协调' ||
1899 // pageData[i].ACTIVITYNAME === '空间协调意见汇总' ||
1900 // pageData[i].ACTIVITYNAME === '前期工作计划决策') {
1901 // pageData[i].BUILDUNIT = "空间协调"
1902 // } else if (pageData[i].ACTIVITYNAME === '提交可研材料' ||
1903 // pageData[i].ACTIVITYNAME === '可研初审' ||
1904 // pageData[i].ACTIVITYNAME === '联评联审' ||
1905 // pageData[i].ACTIVITYNAME === '下达可研报告通知函') {
1906 // pageData[i].BUILDUNIT = "可研协调"
1907 // } else if (pageData[i].FLOWNAME === '工程建设许可阶段并联审批') {
1908 // pageData[i].BUILDUNIT = "工程建设许可"
1909 // } else if (pageData[i].FLOWNAME === '立项用地规划许可阶段并联审批') {
1910 // pageData[i].BUILDUNIT = "用地规划许可"
1911 // } else if (pageData[i].FLOWNAME === '施工许可阶段并联审批') {
1912 // pageData[i].BUILDUNIT = "施工许可"
1913 // } else if (pageData[i].FLOWNAME === '竣工验收阶段并联审批') {
1914 // pageData[i].BUILDUNIT = "竣工验收"
1915 // }
1916 // }
1917 // }
1918 // }
1919 // }, false);
1920 // // -- ↑
1921 // for (var j = 0; j < pageData.length; j++) {//遍历所有项目数据
1922 // var flowTypeStr = pageData[j]["PROJECTFLOWTYPE"];
1923 // var obj = JSON.stringify(pageData[j]);
1924 // var fontweight = "";
1925 // var descrption = pageData[j]["DESCRIPTION"];
1926 // if (descrption != "read") {
1927 // fontweight = ' style=\"font-weight: 600;color: blue;\" ';
1928 // }
1929 // // if (flowType == flowTypeStr) {
1930 // htmlTableBodyTr += "<tr id=\"" + pageData[j]["PROJECTID"] + "\" " + fontweight + ' class=\"group' + i + '\">' +
1931 // "<td width=\"1%\" class=\"checkboxCls\" >" + '<input class="son_check" type="checkbox" name="layTableCheckbox" lay-skin="primary" title="" >' + "</td>" +
1932 // "<td width=\"3%\" onclick=\'workingSeeDetail(this)\' class=\"statusIcon\">" + pageData[j]["BJQX"] + "</td>" +
1933 //
1934 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTSTATUS"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTSTATUS"] + "</div></td>" +
1935 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTCODE"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTCODE"] + "</div></td>" +
1936 //
1937 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["PROJECTNAME"] +"><div class=\"tableCell\">" + pageData[j]["PROJECTNAME"] + "</div></td>" +
1938 //
1939 // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
1940 // "<td width=\"7%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["BINDINGUNIT"] +"><div class=\"tableCell\">" + pageData[j]["BINDINGUNIT"] + "</div></td>" +
1941 // // "<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["REGISTERTIME"] +"><div class=\"tableCell\">" + pageData[j]["REGISTERTIME"] + "</div></td>" +
1942 // `<td width=\"11%\" onclick=\'workingSeeDetail(this)\' title='${ pageData[j]["REGISTERTIME"]}'><div class=\"tableCell\"> ${pageData[j]["REGISTERTIME"]} </div></td>` +
1943 //
1944 // // "<td width=\"12%\" onclick=\'workingSeeDetail(this)\' title=" + pageData[j]["FLOWNAME"] +"><div class=\"tableCell\">" + pageData[j]["FLOWNAME"] + "</div></td>" +
1945 // "</tr>";
1946 // sum++;
1947 // showDataList.push(pageData[j]);//将显示的数据保存
1948 // // }
1949 // }
1950 // if( i >= groupData.length) {
1951 // ownSort(showDataList);
1952 // //往表格中添加一行用于提示分类的标志行
1953 // }
1954 // var htmlTableHeadTr = "";
1955 // htmlTable = "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
1956 // "<thead><tr class=\"tabletitle\"> " +
1957 // "<th width=\"1%\" class=\"checkboxCls\">" + '<input class="parent_check" type="checkbox" name="" lay-skin="primary" title="" >' + "</th>" +
1958 // "<th width=\"3%\" class=\"statusIcon\"></th>" +
1959 // "<th width=\"5%\"><div class=\"tableCell\">状态</div></th>" +
1960 // "<th width=\"8%\"><div class=\"tableCell\">项目编号</div></th>" +
1961 // "<th width=\"20%\"><div class=\"tableCell\">项目名称</div></th> " +
1962 // "<th width=\"22%\"><div class=\"tableCell\">业务类型</div></th>" +
1963 // "<th width=\"10%\"><div class=\"tableCell\">发起部门</div></th>" +
1964 // "<th width=\"14%\"><div class=\"tableCell\">接收时间</div></th>" +
1965 // "</tr>" +
1966 // "</thead>" +
1967 // "<tbody id=\"tbodylist\">" + htmlTableHeadTr + htmlTableBodyTr;
1968 //
1969 // }
1970 // }
1971 else if(orign =='phgl'){
1972 //添加表头 1419 //添加表头
1973 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" + 1420 htmlTable += "<table class=\"striped\" id=\"datalist\" style=\"table-layout: fixed;width: 100%;\">" +
1974 "<thead><tr class=\"tabletitle\"> " + 1421 "<thead><tr class=\"tabletitle\"> " +
...@@ -2022,22 +1469,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -2022,22 +1469,6 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
2022 showDataList.push(data[j]);//将显示的数据保存 1469 showDataList.push(data[j]);//将显示的数据保存
2023 } 1470 }
2024 } 1471 }
2025 //往表格中添加一行用于提示分类的标志行
2026 // var htmlTableHeadTr = "<tr class=\"flowtypeParent\" id=\"" + "group" + i + "\">" +
2027 // "<td width=\"1%\" class=\"iconTd\">" + "<span class=\"glyphicon glyphicon-minus\"></span>" + "</td>" +
2028 // "<td width=\"3%\">" + flowTypeName + "（" + sum + "）" + "</td>" +
2029 // "<td width=\"5%\">" + "" + "</td>" +
2030 // "<td width=\"10%\">" + "" + "</td>" +
2031 // "<td width=\"10%\">" + "" + "</td>" +
2032 // "<td width=\"10%\">" + "" + "</td>" +
2033 // "<td width=\"20%\">" + "" + "</td>" +
2034 // "<td width=\"8%\">" + "" + "</td>" +
2035 // "<td width=\"8%\">" + "" + "</td>" +
2036 // "<td width=\"10%\">" + "" + "</td>" +
2037 // "<td width=\"5%\">" + "" + "</td>" +
2038 // "<td width=\"10%\">" + "" + "</td>" +
2039 // "</tr>";
2040 // htmlTable += htmlTableHeadTr + htmlTableBodyTr;
2041 } 1472 }
2042 } 1473 }
2043 ; 1474 ;
...@@ -2062,6 +1493,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) { ...@@ -2062,6 +1493,7 @@ function dynamicWorkingTable(result, tbodyid, searchtext) {
2062 }, 500) 1493 }, 500)
2063 }) 1494 })
2064 } 1495 }
1496
2065 /* 1497 /*
2066 * 创建分页 1498 * 创建分页
2067 * */ 1499 * */
...@@ -2078,7 +1510,7 @@ function createPage(data) { ...@@ -2078,7 +1510,7 @@ function createPage(data) {
2078 , layout: ['count', 'prev', 'page', 'next', 'skip', 'limit'] 1510 , layout: ['count', 'prev', 'page', 'next', 'skip', 'limit']
2079 , jump: function (obj, first) { 1511 , jump: function (obj, first) {
2080 //首次不执行 1512 //首次不执行
2081 if(!first){ 1513 if (!first) {
2082 parent.window.$.showLoading(); 1514 parent.window.$.showLoading();
2083 setTimeout(() => { 1515 setTimeout(() => {
2084 pageSizeLayui = obj.limit; 1516 pageSizeLayui = obj.limit;
...@@ -2090,21 +1522,22 @@ function createPage(data) { ...@@ -2090,21 +1522,22 @@ function createPage(data) {
2090 }); 1522 });
2091 }) 1523 })
2092 } 1524 }
1525
2093 /* 1526 /*
2094 * desc 冒泡排序 1527 * desc 冒泡排序
2095 * */ 1528 * */
2096 function ownSort(arr){ 1529 function ownSort(arr) {
2097 for(i=0;i<arr.length-1;i++){ 1530 for (i = 0; i < arr.length - 1; i++) {
2098 for(j=0;j<arr.length-1-i;j++){ 1531 for (j = 0; j < arr.length - 1 - i; j++) {
2099 /** 1532 /**
2100 * 比较第j位和j+1的initial值 1533 * 比较第j位和j+1的initial值
2101 * 如果j位的initial值比j+1位的initial值大，那么他们的位置发生交换 1534 * 如果j位的initial值比j+1位的initial值大，那么他们的位置发生交换
2102 * 如果j位的initial值比j+1位的initial值小，那么位置不变 1535 * 如果j位的initial值比j+1位的initial值小，那么位置不变
2103 */ 1536 */
2104 if(arr[j].timeStampVal < arr[j+1].timeStampVal){ 1537 if (arr[j].timeStampVal < arr[j + 1].timeStampVal) {
2105 var temp=arr[j]; 1538 var temp = arr[j];
2106 arr[j]=arr[j+1]; 1539 arr[j] = arr[j + 1];
2107 arr[j+1]=temp; 1540 arr[j + 1] = temp;
2108 } 1541 }
2109 } 1542 }
2110 } 1543 }
...@@ -2165,41 +1598,8 @@ function workingSeeDetail(td) { ...@@ -2165,41 +1598,8 @@ function workingSeeDetail(td) {
2165 //不再验证会议状态 1598 //不再验证会议状态
2166 console.log(data) 1599 console.log(data)
2167 openApproveDetail(data); 1600 openApproveDetail(data);
2168 /*if(data.MEETINGPROJECTSTATE!=null && data.MEETINGPROJECTSTATE!="" && parent.listName!="项目查询" && parent.listName!="已办项目"){
2169 parent.layer?parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7}):opener.parent.layer.msg("项目正在"+data.MEETINGPROJECTSTATE, {icon : 7});
2170 return;
2171 }else{
2172 openApproveDetail(data);
2173 }*/
2174 }
2175 1601
2176 1602 }
2177 /**
2178 * 鼠标悬停显示title 这是修改过的代办项目显示页面使用，lhy修改20181227
2179 * 待办项目未读加粗
2180 */
2181 /*function setCell(data) {
2182 $("#workingsTabDiv tbody td,#workingsTabDiv thead th").each(function() {
2183 var text = $(this).first()[0].innerText.trim();
2184 if(text == "") text = "";
2185 $(this).attr("title", text);
2186 })
2187 if(window.parent.listName == "待办项目") {
2188 $("#datalist tbody tr").not(".flowtypeParent").each(function(index) {//筛选不为分类行的tr，lhy20181227
2189 if(data[index].DESCRIPTION != "read") {
2190 $(this).css("font-weight", "600");
2191 }
2192 })
2193 }*/
2194
2195 /* $(".layui-table-header th").each(function(index) {
2196 var field = $(this).attr("data-field");
2197 fields.push(field);
2198 }) */
2199
2200 /* $(".laytable-cell-1-BJQX").each(function() {
2201 $(this).removeClass("laytable-cell-1-BJQX");
2202 })*/
2203 1603
2204 /** 1604 /**
2205 * 复选框的点击事件 1605 * 复选框的点击事件
...@@ -2394,15 +1794,6 @@ function setCellWidth() { ...@@ -2394,15 +1794,6 @@ function setCellWidth() {
2394 var td_width = thHeader.eq(index).width(); 1794 var td_width = thHeader.eq(index).width();
2395 $(this).width(td_width); 1795 $(this).width(td_width);
2396 1796
2397 /*var td_width1 = $(this).width();
2398 if(index != thHeader.length-1){
2399
2400 $(this).width(thHeader.eq(index).width());
2401 }else{
2402 // TO需要判断是否出现了滚动条
2403 $(this).width(thHeader.eq(index).width() - 10);//最后一个td减去滚动条的宽度
2404 }*/
2405
2406 1797
2407 }); 1798 });
2408 }); 1799 });
...@@ -2513,23 +1904,6 @@ function WaitingToStart() { ...@@ -2513,23 +1904,6 @@ function WaitingToStart() {
2513 } 1904 }
2514 1905
2515 1906
2516 /*function getUnhandledProjectCount() {
2517 $.ajax({
2518 url: CONF_DOCKINGSYSTEM_SERVERURL + '/xiangj/resource/getUnhandledItemCount',
2519 data: {roleid: roleIds},
2520 success: function (result) {
2521 if (result) {
2522 $('.w-badge').text(result).css('display', 'inline-block');
2523 } else {
2524 $('.w-badge').css('display', 'none');
2525 }
2526 },
2527 error: function (error) {
2528
2529 }
2530 })
2531 }*/
2532
2533 function uuid() { 1907 function uuid() {
2534 function S4() { 1908 function S4() {
2535 return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); 1909 return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
...@@ -2567,22 +1941,22 @@ function postDataToServe(_url, _data, _fn, _async) { ...@@ -2567,22 +1941,22 @@ function postDataToServe(_url, _data, _fn, _async) {
2567 } 1941 }
2568 1942
2569 1943
2570
2571 // ly 新加方法，变量列表 1944 // ly 新加方法，变量列表
2572 var lyfunc = { 1945 var lyfunc = {
2573 tabsChanges: function (val) { 1946 tabsChanges: function (val) {
2574 parent.window.$.showLoading(); 1947 parent.window.$.showLoading();
2575 if(val == 1) { 1948 if (val == 1) {
2576 $('#sjsqTable').addClass("select-tables"); 1949 $('#sjsqTable').addClass("select-tables");
2577 $('#sjsqTable').find('img').attr("src","./img/menu-document-selected.png"); 1950 $('#sjsqTable').find('img').attr("src", "./img/menu-document-selected.png");
2578 $('#cgscTable').removeClass("select-tables"); 1951 $('#cgscTable').removeClass("select-tables");
2579 $('#cgscTable').find('img').attr("src","./img/menu-document-checkbox.png"); 1952 $('#cgscTable').find('img').attr("src", "./img/menu-document-checkbox.png");
2580 }else { 1953 } else {
2581 $('#cgscTable').addClass("select-tables"); 1954 $('#cgscTable').addClass("select-tables");
2582 $('#cgscTable').find('img').attr("src","./img/menu-document-selected.png"); 1955 $('#cgscTable').find('img').attr("src", "./img/menu-document-selected.png");
2583 $('#sjsqTable').find('img').attr("src","./img/menu-document-checkbox.png"); 1956 $('#sjsqTable').find('img').attr("src", "./img/menu-document-checkbox.png");
2584 $('#sjsqTable').removeClass("select-tables"); 1957 $('#sjsqTable').removeClass("select-tables");
2585 }; 1958 }
1959 ;
2586 isType = val; 1960 isType = val;
2587 isClickPage = true; 1961 isClickPage = true;
2588 dynamicWorkingTable(resultTableData, "workingsTabDiv", 'searchtext'); 1962 dynamicWorkingTable(resultTableData, "workingsTabDiv", 'searchtext');
......
...@@ -187,23 +187,6 @@ $(function () { ...@@ -187,23 +187,6 @@ $(function () {
187 document.title = "新建项目"; 187 document.title = "新建项目";
188 } 188 }
189 189
190 // FIXME: 暂时remove()
191 // initOneMap();
192 /*if (create === 0 || create == '0' || create == '1') {
193 creatingProject();
194 return;
195 } else {
196 $("#report_div").css("display", "none");
197 }
198 if (!taskId && stats != "Manage") {
199 lookThroughProject();
200 } else if (!taskId && stats == "Manage") {
201 lookProjectManage();
202 } else {
203 console.log("dealingProject() 开始处理");
204 dealingProject();
205 }*/
206
207 initOneMap(); 190 initOneMap();
208 if (create === 0 || create == '0' || create == '1') { 191 if (create === 0 || create == '0' || create == '1') {
209 creatingProject(); 192 creatingProject();
...@@ -4409,35 +4392,11 @@ function projectSend(projectid, newData, olddata, index, layero) { ...@@ -4409,35 +4392,11 @@ function projectSend(projectid, newData, olddata, index, layero) {
4409 function sendSuccessPage(index) { 4392 function sendSuccessPage(index) {
4410 var content = ""; 4393 var content = "";
4411 var source = ""; 4394 var source = "";
4412 /*$.ajax({
4413 url:CONF_BACK_SERVERURL + "/mvc/sctips/tiplist.do",
4414 async:false,
4415 headers:{
4416 "token":$.cookie('ftoken')
4417 },
4418 success:function(data){
4419 if(data.length>0){
4420 var index = Math.floor(Math.random()*data.length);
4421 content = data[index].content;
4422 source = data[index].source;
4423 }
4424 },
4425 error:function(){
4426 console.log("获取小贴士菜单出错");
4427 }
4428 })*/
4429 $(".button-operation").css("display", "none"); 4395 $(".button-operation").css("display", "none");
4430 //发送成功后右侧滚动条隐藏 4396 //发送成功后右侧滚动条隐藏
4431 $(".mCSB_dragger_bar").css("display", "none"); 4397 $(".mCSB_dragger_bar").css("display", "none");
4432 //发送成功自动滚到最上面 4398 //发送成功自动滚到最上面
4433 $("#bodycontent").mCustomScrollbar("scrollTo", "top"); 4399 $("#bodycontent").mCustomScrollbar("scrollTo", "top");
4434
4435 /*$("#content").html("&nbsp&nbsp&nbsp"+content);
4436 $("#source").html("----------《"+source+"》");
4437 $("#form").css('display','none');
4438 $("#divPrompt").css('display','block');
4439 $("#countDiv").css('display','block');
4440 $("#centerFooter").css('display','none');*/
4441 layer.close(index); 4400 layer.close(index);
4442 layer.closeAll(); 4401 layer.closeAll();
4443 if (saveprojectLoading) { 4402 if (saveprojectLoading) {
......
1 /*var dojoConfig = {}; 1 /*jshint esversion: 6 */
2 dojoConfig.baseUrl = "/frontweb/js/arcgis_js_api/dojo";*/
3 require([ 2 require([
4 "esri/Map", 3 'esri/Map',
5 "esri/views/MapView", 4 'esri/views/MapView',
6 "esri/Basemap", 5 'esri/layers/TileLayer',
7 "esri/layers/TileLayer", 6 'esri/geometry/Extent',
8 "esri/geometry/Extent" 7 'esri/layers/MapImageLayer',
9 ], function (Map, MapView, Basemap, TileLayer, Extent) { 8 'esri/layers/WebTileLayer',
10 9 ], function (
11 let dianzi_imageMap = new TileLayer({ 10 Map, MapView, TileLayer, Extent, MapImageLayer, WebTileLayer
12 url: 'https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer' //电子底图 11 ) {
13 }); 12 let basemapIcon = {
14 13 yxdt: './image/dzdt_normal.png',
15 let ext = new Extent({ 14 dzdt: './image/yxdt_normal.png'
16 xmin: 1.1333776806012768E7, 15 };
17 ymin: 4378389.417203172, 16 let layer_electronicMap = new MapImageLayer({
18 xmax: 1.133851590176645E7, 17 url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 影像地图
19 ymax: 4382058.3945608605, 18 sublayers: [
20 "spatialReference": { 19 {
21 "wkid": 3857 20 id: 0,
21 visible: true
22 } 22 }
23 ]
24 });
25 //天地图 电子地图
26 const tiledLayer = new WebTileLayer({
27 urlTemplate:
28 'http://{subDomain}.tianditu.gov.cn/DataServer?T=vec_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
29 subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
30 });
31 //天地图 标注 电子地图
32 const tiledLayer_poi = new WebTileLayer({
33 urlTemplate:
34 'http://{subDomain}.tianditu.gov.cn/DataServer?T=cva_w&x={col}&y={row}&l={level}&tk=b46395ce4ec77f490158eebe439ac559',
35 subDomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
23 }); 36 });
24 37 // 创建地图实例
25 var basemap = new Basemap({ 38 const ext = new Extent({
26 baseLayers: [ 39 xmin: 1.1332182150213555E7,
27 new MapImageLayer({ 40 ymin: 4379415.470661429,
28 url: "https://192.168.5.164:6443/arcgis/rest/services/xzsj/ygyx/MapServer", 41 xmax: 1.1339935515720293E7,
29 title: "Basemap" 42 ymax: 4383168.328167147,
30 }) 43 spatialReference: 3857
31 ],
32 title: "basemap",
33 id: "basemap"
34 }); 44 });
35 var map = new Map({ 45 var myMap = new Map();
36 basemap: basemap 46 var myView = new MapView({
47 container: 'map',
48 map: myMap,
49 extent: ext,
50 });
51 myView.ui._removeComponents(['attribution']); // 移除地图来源信息
52 myMap.add(tiledLayer);
53 myMap.add(tiledLayer_poi);
54 var dt = 'dianzi';
55 $('#trigger').attr('src', basemapIcon.dzdt);
56 $(function () {
57 $('#trigger').click(function () {
58 if (dt === 'yingxiang') {
59 $('#trigger').attr('src', basemapIcon.dzdt);
60 myMap.remove(tiledLayer);
61 myMap.remove(tiledLayer_poi);
62 myMap.add(layer_electronicMap);
63 dt = 'dianzi';
64 } else if (dt === 'dianzi') {
65 $('#trigger').attr('src', basemapIcon.yxdt);
66 myMap.remove(layer_electronicMap);
67 myMap.add(tiledLayer);
68 myMap.add(tiledLayer_poi);
69 dt = 'yingxiang';
70 }
37 }); 71 });
38 var view = new MapView({
39 container: "map",
40 map: map,
41 constraints: {
42 lods: TileInfo.create().lods
43 },
44 zoom: 12
45 }); 72 });
46 }); 73 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,18 +8,33 @@ ...@@ -8,18 +8,33 @@
8 <script src="../../../../js/arcgis_js_api/init.js"></script> 8 <script src="../../../../js/arcgis_js_api/init.js"></script>
9 <script src="js/widget.js"></script> 9 <script src="js/widget.js"></script>
10 <style type="text/css"> 10 <style type="text/css">
11 #map { 11 html, body {
12 margin: 0;
12 width: 100%; 13 width: 100%;
13 height: 900px; 14 height: 100%;
14 border: #0a36e9 solid 1px; 15 overflow: hidden;
16 }
17
18 #map .esri-ui {
19 display: none;
20 }
21
22 .esri-view .esri-display-object, .esri-view .esri-bitmap {
23 position: absolute;
24 border: none;
25 margin: 0;
26 padding: 0;
27 -webkit-user-drag: none;
28 -webkit-user-select: none;
15 } 29 }
16 </style> 30 </style>
17 </head> 31 </head>
18 <body> 32 <body>
19 <div style=" position: absolute; right: 5px; top: 5px; z-index: 99;margin: 10px"> 33 <div style=" position: absolute; right: 5px; top: 5px; z-index: 99;">
20 <img id="trigger" style=" width: 50px; "> 34 <img id="trigger" src="" style=" width: 50px; ">
21 </div> 35 </div>
22 <div id="map"> 36 <div id="map" style="height: 250px; max-height: 250px">
37
23 </div> 38 </div>
24 </body> 39 </body>
25 </html> 40 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2059,7 +2059,7 @@ require([ ...@@ -2059,7 +2059,7 @@ require([
2059 2059
2060 let layer_electronicMap = new MapImageLayer({ 2060 let layer_electronicMap = new MapImageLayer({
2061 //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图 2061 //url: 'http://10.6.144.88:6080/arcgis/rest/services/实施监督系统/地图灰化2/MapServer' // 电子地图
2062 url: 'https://192.168.5.143:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图 2062 url: 'https://192.168.3.194:6443/arcgis/rest/services/xzsj/ygyx/MapServer', // 电子地图
2063 sublayers: [ 2063 sublayers: [
2064 { 2064 {
2065 id: 0, 2065 id: 0,
......
...@@ -305,31 +305,16 @@ tr td:first-child { ...@@ -305,31 +305,16 @@ tr td:first-child {
305 <a class="bumpbox_white">退件办结</a> 305 <a class="bumpbox_white">退件办结</a>
306 <!-- 结束改为退件办结 2018年12月5日 yyl--> 306 <!-- 结束改为退件办结 2018年12月5日 yyl-->
307 </button> 307 </button>
308 <!-- <button id="sendBtn" class="btn btn-info " type="button" -->
309 <!-- onclick="batchSendClick()"> -->
310 <!-- <span class="glyphicon glyphicon-send" style="font-size: 15px"></span> <a -->
311 <!-- class="bumpbox_white">发送</a> -->
312 <!-- </button> -->
313 <button id="continueProject" class="btn buttonStatusStyle disabled" 308 <button id="continueProject" class="btn buttonStatusStyle disabled"
314 type="button" style="display: none;" onclick="openlayer_continue()"> 309 type="button" style="display: none;" onclick="openlayer_continue()">
315 <span class="glyphicon glyphicon-play-circle" 310 <span class="glyphicon glyphicon-play-circle"
316 style="font-size: 15px"></span> <a class="bumpbox_white">续办</a> 311 style="font-size: 15px"></span> <a class="bumpbox_white">续办</a>
317 </button> 312 </button>
318 <!-- <button class="btn btn-info " type="button" -->
319 <!-- onclick="openlayer_type()" disabled="disabled"> -->
320 <!-- <span class="glyphicon glyphicon-pause" style="font-size: 15px"></span> <a -->
321 <!-- class="bumpbox_white">暂停</a> -->
322 <!-- </button> -->
323 <button id="journal" class="btn buttonStatusStyle disabled" 313 <button id="journal" class="btn buttonStatusStyle disabled"
324 type="button" style="display: none;" onclick="openJournal()"> 314 type="button" style="display: none;" onclick="openJournal()">
325 <span class="glyphicon glyphicon-list-alt" style="font-size: 15px"></span> 315 <span class="glyphicon glyphicon-list-alt" style="font-size: 15px"></span>
326 <a class="bumpbox_white">日志</a> 316 <a class="bumpbox_white">日志</a>
327 </button> 317 </button>
328 <!-- <button class="btn btn-info " type="button" disabled="disabled" -->
329 <!-- onclick="openProject()"> -->
330 <!-- <span class="icon-comments" style="font-size: 15px"></span> <a -->
331 <!-- class="bumpbox_white">上会</a> -->
332 <!-- </button> -->
333 <button id="projectTreebtn" class="btn buttonStatusStyle disabled" 318 <button id="projectTreebtn" class="btn buttonStatusStyle disabled"
334 type="button" style="display: none;" onclick="openlayer_tree()"> 319 type="button" style="display: none;" onclick="openlayer_tree()">
335 <span class="glyphicon glyphicon-tree-conifer" 320 <span class="glyphicon glyphicon-tree-conifer"
...@@ -350,12 +335,6 @@ tr td:first-child { ...@@ -350,12 +335,6 @@ tr td:first-child {
350 class="glyphicon glyphicon-plus bindingAssignee" title="选择类型" 335 class="glyphicon glyphicon-plus bindingAssignee" title="选择类型"
351 onclick="selectProjecType()"></a> 336 onclick="selectProjecType()"></a>
352 </div> 337 </div>
353 <%--<div class="search" style="position: relative;">
354 <label>业务类别</label> <select id="documentType" onchange="changeType()">
355 <option>所有</option>
356 <option v-for="option in options" v-bind:value="option.value">{{option.text}}</option>
357 </select>
358 </div>--%>
359 </div> 338 </div>
360 <div class="clearboth"></div> 339 <div class="clearboth"></div>
361 340
...@@ -363,9 +342,6 @@ tr td:first-child { ...@@ -363,9 +342,6 @@ tr td:first-child {
363 342
364 <!-- 以下更改lhy --> 343 <!-- 以下更改lhy -->
365 <div id="workingsTabDiv"> 344 <div id="workingsTabDiv">
366 <!-- <div id="workingsTabDiv"
367 style="min-height: 60px; overflow-x: hidden; overflow-y: auto; "> -->
368
369 345
370 </div> 346 </div>
371 <!-- 以上更改 --> 347 <!-- 以上更改 -->
...@@ -375,34 +351,6 @@ tr td:first-child { ...@@ -375,34 +351,6 @@ tr td:first-child {
375 <div id="page" style="float: right"></div> 351 <div id="page" style="float: right"></div>
376 </div> 352 </div>
377 353
378 <!-- <div id="page" style="float: right"></div> -->
379
380 <!-- <div id="nvaTab" class="data-list" style="margin-top:10px;display:none">
381 <div style="width: 100%;" dir="ltr" id="gbox_gridTable"
382 class="ui-jqgrid ui-widget ui-widget-content ui-corner-all">
383
384 <div style="width: 100%;" id="gview_gridTable"
385 class="ui-jqgrid-view">
386
387 <div id="dataTableDiv" class="ui-state-default ui-jqgrid-hdiv" style="width: 100%;">
388 <table class="table datatable">
389
390 </table>
391 <div class="nav-page">
392 <div>
393 共<span id="total_records"></span>条，共<span id="total_page"></span>页
394 </div>
395 <nav style="cursor:pointer;">
396 <ul class="pagination">
397 </ul>
398 </nav>
399 </div>
400
401 </div>
402 </div>
403 </div>
404 </div> -->
405
406 <div id="msg" 354 <div id="msg"
407 style="display: none; position: absolute; top: 50%; left: 50%;"> 355 style="display: none; position: absolute; top: 50%; left: 50%;">
408 <div 356 <div
......