Переглянути джерело

工作内容-隐蔽工程量

user5 5 роки тому
батько
коміт
6079ae5760

+ 12 - 6
src/main/webapp/webpage/modules/projectcontentinfo/workContentForm.jsp

@@ -930,19 +930,25 @@
                                 },
                                 success: function (tableTypeList) {
                                     var dataList = data.body.list;
+                                    var newDataList = [];
                                     var holdDataList = data.body.list;
+                                    if (0 != dataList.length) {
+                                        for (i in holdDataList) {
+                                            newDataList.push(holdDataList[i])
+                                        }
+                                    }
                                     var showList = [];
-                                    if (0 != dataList.length && 0 !=tableTypeList.length){
-                                        for (i in dataList) {
+                                    if (0 != newDataList.length && 0 !=tableTypeList.length){
+                                        for (i in newDataList) {
                                             for (j in tableTypeList) {
-                                                if (dataList[i].value == tableTypeList[j]) {
+                                                if (newDataList[i].value == tableTypeList[j]) {
                                                     var newData = {
-                                                        "name": dataList[i].name,
-                                                        "value": dataList[i].value,
+                                                        "name": newDataList[i].name,
+                                                        "value": newDataList[i].value,
                                                         "selected": true
                                                     }
                                                     showList.push(newData);
-                                                    holdDataList.splice(i,1);
+                                                    holdDataList.splice(0,1);
                                                 }/* else {
                                                     showList.push(dataList[i]);
                                                 }*/

+ 14 - 11
src/main/webapp/webpage/modules/projectcontentinfo/workContentView.jsp

@@ -831,24 +831,26 @@
                                 },
                                 success: function (tableTypeList) {
                                     var dataList = data.body.list;
+                                    var newDataList = [];
                                     var holdDataList = data.body.list;
+                                    if (0 != dataList.length) {
+                                        for (i in holdDataList) {
+                                            newDataList.push(holdDataList[i])
+                                        }
+                                    }
                                     var showList = [];
-                                    var showTypeList = [];
-                                    if (0 != dataList.length && 0 !=tableTypeList.length){
-                                        for (i in dataList) {
+                                    if (0 != newDataList.length && 0 !=tableTypeList.length){
+                                        for (i in newDataList) {
                                             for (j in tableTypeList) {
-                                                if (dataList[i].value == tableTypeList[j]) {
+                                                if (newDataList[i].value == tableTypeList[j]) {
                                                     var newData = {
-                                                        "name": dataList[i].name,
-                                                        "value": dataList[i].value,
+                                                        "name": newDataList[i].name,
+                                                        "value": newDataList[i].value,
                                                         "selected": true
                                                     }
                                                     showList.push(newData);
-                                                    holdDataList.splice(i,1);
-                                                } /*else {
-                                                    showList.push(dataList[i]);
-                                                }*/
-                                                modifyGetDetailsNum(tableTypeList);
+                                                    holdDataList.splice(0,1);
+                                                }
                                             }
                                         }
                                         for (i in holdDataList){
@@ -859,6 +861,7 @@
                                             language: 'zn',
                                             data: showList
                                         })
+                                        modifyGetDetailsNum(tableTypeList);
                                         $("#dataBodyList").val(showList);
                                     }else{
                                         xmSelect.render({