Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/xml/ModuleBlockMapper.xml

@@ -52,7 +52,7 @@
 				AND a.md_version =  #{mdVersion}
 			</if>
 		</where>
-		order by md_version+0,md_big_sort,md_the_sort,md_small_sort
+		order by md_version+0 desc ,md_big_sort,md_the_sort,md_small_sort
 	</select>
 	
 	<select id="findAllList" resultType="MaterialProject" >

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleListingNewForm.jsp

@@ -23,7 +23,6 @@
                 jp.loading();
                 jp.post("${ctx}/managementcenter/moduleacquisition/moduleListing/save",$('#inputForm').serialize(),function(data){
                     if(data.success){
-                        $('#moduleNewListingTable').bootstrapTable('refresh');
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
                         parent.layer.close(dialogIndex);
                         jp.success(data.msg);

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleNewListing.js

@@ -228,7 +228,7 @@ $(document).ready(function() {
 		});
 		
 	});
-		
+
   function getIdSelections() {
         return $.map($("#moduleNewListingTable").bootstrapTable('getSelections'), function (row) {
             return row.id
@@ -257,7 +257,23 @@ $(document).ready(function() {
   }
   
    function add(){
-	  jp.openSaveDialog('新增模块表', "${ctx}/managementcenter/moduleacquisition/moduleListing/form",'800px', '500px');
+       top.layer.open({
+           type: 2,
+           area: ["800px", "500px"],
+           title: "新增模块清单",
+           auto:false,
+           maxmin: true, //开启最大化最小化按钮
+           content: "${ctx}/managementcenter/moduleacquisition/moduleListing/form",
+           btn: ['确定', '关闭'],
+           yes: function(index, layero){
+               var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
+               iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
+               refresh();
+           },
+           cancel: function(index){
+           }
+       });
+	  // jp.openSaveDialog('新增模块表', "${ctx}/managementcenter/moduleacquisition/moduleListing/form",'800px', '500px');
   }
 
 
@@ -266,7 +282,23 @@ $(document).ready(function() {
         if(id == undefined){
             id = getIdSelections();
         }
-        jp.openSaveDialog('模块清单', "${ctx}/managementcenter/moduleacquisition/moduleListing/form?id="+id, '800px', '500px');
+        top.layer.open({
+            type: 2,
+            area: ['800px', '500px'],
+            title: "修改模块清单",
+            auto:false,
+            maxmin: true, //开启最大化最小化按钮
+            content: '${ctx}/managementcenter/moduleacquisition/moduleListing/form?id='+id,
+            btn: ['确定', '关闭'],
+            yes: function(index, layero){
+                var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
+                refresh();
+            },
+            cancel: function(index){
+            }
+        });
+        // jp.openSaveDialog('模块清单', "${ctx}/managementcenter/moduleacquisition/moduleListing/form?id="+id, '800px', '500px');
     }
   
      function view(id){//没有权限时，不显示确定按钮