fix: 线设置部门扭转问题修复

bpm-core/src/main/resources/static/designer/app/controllers/process/designer/approver.js

@@ -744,6 +744,7 @@ require(['text!view/process/approver_table_tbody.hbs'
                     countersign: countersign,
                     id: JTDC.guid()
                 });
+                console.log(page.approverCondition);
                 $(page.el.val).val(JSON.stringify(page.approverCondition));
                 page.renderTable();
                 layer.close(index);

bpm-core/src/main/resources/static/designer/app/controllers/process/designer/cc.js

@@ -330,6 +330,7 @@ require(['text!view/process/cc_table_tbody.hbs',
                             subject: subjects,
                             id: JTDC.guid()
                         });
+                        console.log(ccCondition);
                         $(el.val).val(JSON.stringify(ccCondition));
                         renderTable();
                         layer.close(index);

bpm-core/src/main/resources/static/designer/app/controllers/process/designer/line.js

@@ -1,5 +1,3 @@
-  
-
 /**
  *
  * @author sog
@@ -30,17 +28,17 @@ require(
 
         var includeRelatios = [
             {id: 'include', text: '包含'}
-            ,  {id: 'exclude', text: '不包含'}
+            , {id: 'exclude', text: '不包含'}
         ];
 
         var existRelatios = [
             {id: 'exist', text: '存在'}
-            ,  {id: 'nothingness', text: '不存在'}
+            , {id: 'nothingness', text: '不存在'}
         ];
 
         var yesRelations = [
             {id: 'is', text: '是'}
-            ,  {id: 'not', text: '不是'}
+            , {id: 'not', text: '不是'}
         ];
 
         var tbodyTpl = Handlebars.compile(tbodyTxt);
@@ -359,10 +357,14 @@ require(
                                 callback: function (choiceOrganizations) {
                                     if (choiceOrganizations) {
                                         var names = [];
+                                        var orgArray = [];
                                         $.each(choiceOrganizations, function (i, val) {
                                             names.push(val.name);
+                                            val.id = val.id.replace("ORG", "");
+                                            val.pid = val.pid.replace("ORG", "");
+                                            orgArray.push(val);
                                         });
-                                        iptSelect.val(JSON.stringify(choiceOrganizations));
+                                        iptSelect.val(JSON.stringify(orgArray));
                                         iptValue.val(names.join(','));
                                     }
                                 }
@@ -375,10 +377,13 @@ require(
                                 callback: function (choiceOrganizations) {
                                     if (choiceOrganizations) {
                                         var names = [];
+                                        var userArray = [];
                                         $.each(choiceOrganizations, function (i, val) {
                                             names.push(val.name);
+                                            val.orgId = val.orgId.replace("ORG", "");
+                                            userArray.push(val)
                                         });
-                                        iptSelect.val(JSON.stringify(choiceOrganizations));
+                                        iptSelect.val(JSON.stringify(userArray));
                                         iptValue.val(names.join(','));
                                     }
                                 }
@@ -492,7 +497,10 @@ require(
                                         var comboValues = $conditionIndexPanel.find('select.combo_value').select2('data');
                                         if (comboValues && comboValues.length > 0) {
                                             var userProjectSelect = comboValues[0];
-                                            data['userProject'] = {id: userProjectSelect.id, name: userProjectSelect.text};
+                                            data['userProject'] = {
+                                                id: userProjectSelect.id,
+                                                name: userProjectSelect.text
+                                            };
                                         }
                                         break;
                                     case 7:
@@ -530,7 +538,10 @@ require(
                                             var roleSize_8 = projectRole_8.length;
                                             for (var r_index_8 = 0; r_index_8 < roleSize_8; r_index_8++) {
                                                 p_role_8 = projectRole_8[r_index_8];
-                                                p_roles_8.push({id: p_role_8.id, name: p_role_8.text})
+                                                p_roles_8.push({
+                                                    id: p_role_8.id,
+                                                    name: p_role_8.text
+                                                })
                                             }
                                             data['projectRoles'] = p_roles_8;
                                             console.log('p_roles_8', p_role_8);

bpm-core/src/main/resources/static/designer/app/design/flow-node-setting/panel/line.js

@@ -85,8 +85,10 @@ define(function (require, exports, module) {
                     yes: function (index, layero) {
                         var body = layer.getChildFrame('body', index); //LAYER对象下的方法，获取子iframe中的DOM
                         var conditionText = body.contents().find('#condition_val').val();
+                        console.log(conditionText);
                         if (conditionText && conditionText.length > 0) {
-                            self.setNodeSetting('conditions', JSON.parse(conditionText));
+                            var conditions = JSON.parse(conditionText);
+                            self.setNodeSetting('conditions', conditions);
                         }
                         layer.close(index);
                     }

bpm-core/src/main/resources/static/designer/app/tpl/process/cc.hbs

@@ -12,15 +12,15 @@
         <input type="hidden" id="ipt-cc-select-value" value="[]">
 
     </div>
-    <div class="clo-md-12 pt5">
+{{!--     <div class="clo-md-12 pt5"> --}}
 
-        <div class="bs-component ">
-            <div class="checkbox-custom">
-                <input type="checkbox" name="type" value="2" id="type_2">
-                <label for="type_2">申请人直接上级</label>
-                <input type="checkbox" name="type" value="3" id="type_3">
-                <label for="type_3">审批人直接上级</label>
-            </div>
-        </div>
-    </div>
+{{!--         <div class="bs-component "> --}}
+{{!--             <div class="checkbox-custom"> --}}
+{{!--                 <input type="checkbox" name="type" value="2" id="type_2"> --}}
+{{!--                 <label for="type_2">申请人直接上级</label> --}}
+{{!--                 <input type="checkbox" name="type" value="3" id="type_3"> --}}
+{{!--                 <label for="type_3">审批人直接上级</label> --}}
+{{!--             </div> --}}
+{{!--         </div> --}}
+{{!--     </div> --}}
 </div>