Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

src/main/resources/mapping/PeWordtemplateCQuery.xml

@@ -15,5 +15,6 @@
         <if test="pflowid != null">
             and f.parentId = #{pflowid}
         </if>
+        order by t.sort
     </select>
 </mapper>

src/main/resources/static/app/main/partyExpand/flowConfig/config.js

@@ -6,7 +6,7 @@
         $scope.isview = $stateParams.isview != 0 || $stateParams.isview != "0";
 
         $scope.$on('tabChildReloadData', function (event, data) {
-            if (data.name == 'nodeEditCtrl') {
+            if (data.name == 'flowConfigCtrl') {
                 $scope.loadData();
             }
         });

src/main/resources/static/app/main/partyExpand/flowConfig/nodeEdit.html

@@ -76,21 +76,21 @@
                     </div>
                 </div>
             </div>
-            <div class="row clearfix">
-                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 form-control-label">
-                    <label>跳转页面</label>
-                </div>
-                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
-                    <div class="form-group">
-                        <div class="form-line">
-                            <input type="text" name="url" ng-model="modalData.url" style="font-size: 17px"
-                                   class="form-control" ng-required="true"/>
-                        </div>
-                        <label class="error"
-                               ng-show="modalForm.url.$invalid &&  modalForm.$submitted">必填.</label>
-                    </div>
-                </div>
-            </div>
+<!--            <div class="row clearfix">-->
+<!--                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 form-control-label">-->
+<!--                    <label>跳转页面</label>-->
+<!--                </div>-->
+<!--                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">-->
+<!--                    <div class="form-group">-->
+<!--                        <div class="form-line">-->
+<!--                            <input type="text" name="url" ng-model="modalData.url" style="font-size: 17px"-->
+<!--                                   class="form-control" ng-required="true"/>-->
+<!--                        </div>-->
+<!--                        <label class="error"-->
+<!--                               ng-show="modalForm.url.$invalid &&  modalForm.$submitted">必填.</label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="row clearfix">
                 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 form-control-label">
                     <label>工作指引</label>
@@ -101,16 +101,16 @@
                     </textarea>
                 </div>
             </div>
-            <div class="row clearfix">
-                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 form-control-label">
-                    <label>App端工作指引</label>
-                </div>
-                <div class="col-lg-11 col-md-11 col-sm-11 col-xs-11" style="padding-left: 0px;">
-                    <textarea ng-model="modalData.appguidelines" ui-ueditor>
+<!--            <div class="row clearfix">-->
+<!--                <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 form-control-label">-->
+<!--                    <label>App端工作指引</label>-->
+<!--                </div>-->
+<!--                <div class="col-lg-11 col-md-11 col-sm-11 col-xs-11" style="padding-left: 0px;">-->
+<!--                    <textarea ng-model="modalData.appguidelines" ui-ueditor>-->
 
-                    </textarea>
-                </div>
-            </div>
+<!--                    </textarea>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form_foot">
                 <button type="button" class="btn btn-default" ng-click="pagechange();">取消</button>
                 <button role-permission-code="" type="submit"

src/main/resources/static/app/main/partyExpand/template/list.html

@@ -83,19 +83,19 @@
                             </thead>
                             <tbody>
                             <tr ng-repeat="it in dataList">
-                                <td>{{it.TITLE}}</td>
-                                <td>{{it.PFLOWNAME}}</td>
-                                <td>{{it.FLOWNAME}}</td>
-                                <td>{{it.SORT}}</td>
-                                <td>{{it.CREATETIME | date:'yyyy-MM-dd'}}</td>
+                                <td>{{it.title}}</td>
+                                <td>{{it.pflowname}}</td>
+                                <td>{{it.flowname}}</td>
+                                <td>{{it.sort}}</td>
+                                <td>{{it.createtime|date:'yyyy-MM-dd'}}</td>
                                 <th class="text-center">
                                     <button role-permission-code="pewordtemplateList.listEdit" class="btn td-btn bg-light-green waves-effect"
-                                            ng-click="editData(it.WORDTEMPLATEID)"
+                                            ng-click="editData(it.wordtemplateid)"
                                             title="修改">
                                         修改
                                     </button>
                                     <button role-permission-code="pewordtemplateList.listDel" class="btn td-btn bg-pink waves-effect"
-                                            ng-click="delData(it.WORDTEMPLATEID)" title="删除">
+                                            ng-click="delData(it.wordtemplateid)" title="删除">
                                         删除
                                     </button>
                                 </th>