Browse Source

清单规则上移下移数据显示问题

zhongzewei 7 years ago
parent
commit
a414a542b6

+ 4 - 1
web/building_saas/main/js/views/character_content_view.js

@@ -1206,9 +1206,12 @@ let pageCCOprObj = {
             let characterArray = [];
             let characterArray = [];
             let count = 1;
             let count = 1;
             for (const tmp of itemCharacter) {
             for (const tmp of itemCharacter) {
-                if (tmp.eigenvalue === undefined || tmp.eigenvalue.length <= 0 || !tmp.isChecked) {
+                if (!tmp.isChecked) {
                     continue;
                     continue;
                 }
                 }
+                if(tmp.eigenvalue === undefined || tmp.eigenvalue.length <= 0){
+                    tmp.eigenvalue = [];
+                }
                 // 获取选中的特征值
                 // 获取选中的特征值
                 let selectedEigen = '';
                 let selectedEigen = '';
                 for (const eigen of tmp.eigenvalue) {
                 for (const eigen of tmp.eigenvalue) {

+ 2 - 2
web/building_saas/pm/js/pm_share.js

@@ -670,7 +670,7 @@ const pmShare = (function () {
         }
         }
         let copyMap = {copy: null, update: null};
         let copyMap = {copy: null, update: null};
         let newName = `${selected.data.name} (${selected.data.userInfo.name}共享)`;
         let newName = `${selected.data.name} (${selected.data.userInfo.name}共享)`;
-        //获取单项工程的最末单位工程
+        //获取单项工程的单位工程
         let tenderQuery = {$or: [{deleteInfo: null}, {'deleteInfo.deleted': false}], userID: userID, ParentID: engID};
         let tenderQuery = {$or: [{deleteInfo: null}, {'deleteInfo.deleted': false}], userID: userID, ParentID: engID};
         CommonAjax.post('/pm/api/getProjectsByQuery', {user_id: userID, query: tenderQuery, options: '-_id -property'}, function (rstData) {
         CommonAjax.post('/pm/api/getProjectsByQuery', {user_id: userID, query: tenderQuery, options: '-_id -property'}, function (rstData) {
             let updateTender = null;
             let updateTender = null;
@@ -700,7 +700,7 @@ const pmShare = (function () {
                 createDateTime: selected.data.createDateTime,
                 createDateTime: selected.data.createDateTime,
                 fileVer: selected.data.fileVer ? selected.data.fileVer : '',
                 fileVer: selected.data.fileVer ? selected.data.fileVer : '',
                 projType: selected.data.projType,
                 projType: selected.data.projType,
-                property: selected.data.property,
+                property: {},
                 recentDateTime: selected.data.recentDateTime,
                 recentDateTime: selected.data.recentDateTime,
                 fullFolder: selected.data.fullFolder
                 fullFolder: selected.data.fullFolder
             };
             };