2
0

2 کامیت‌ها 36ef68153b ... bda0915ec6

نویسنده SHA1 پیام تاریخ
  tianwu.sun bda0915ec6 Merge remote-tracking branch 'origin/master' 2 ماه پیش
  tianwu.sun b64a7ea3ee 优化 2 ماه پیش

+ 6 - 4
src/main/resources/static/js/appjs/datas/data/batchAdd.js

@@ -21,10 +21,12 @@ function save() {
         },
         success: function (data) {
             if (data.code == 0) {
-                parent.layer.msg("操作成功");
-                parent.reLoad();
-                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(index);
+                console.log("1; " + data.toString())
+                parent.layer.open({
+                    title: '导入提示信息'
+                    , content: "操作成功, " + data.msg,
+                    btnAlign: 'c'
+                });
 
             } else {
                 parent.layer.alert(data.msg)

+ 1 - 2
src/main/resources/static/js/appjs/datas/data/dataImport.js

@@ -24,7 +24,6 @@ function save() {
 				console.log(data.toString())
 				if (data.msg != null && data.msg != '0') {
 					console.log("1; " + data.toString())
-					// parent.layer.msg("操作成功, " + data.msg + "条非本省数据!");
 					parent.layer.open({
 						title: '导入提示信息'
 						, content: "操作成功, " + data.msg,
@@ -111,7 +110,7 @@ function initUpload() {
 				parent.layer.open({
 					title: ['导入提示信息', 'text-align: center']
 					, icon: 7
-					, content: "操作成功 <br/>" + finalContent,
+					, content: "操作成功, " + data.response.msg,
 					btnAlign: 'c'
 				});
 				parent.reLoad();

+ 2 - 6
src/main/resources/static/js/appjs/datas/dataImport/batchAdd.js

@@ -103,11 +103,7 @@ function initUpload() {
             // 成功时 有当前省外的数据 提示
             if (data.response.msg != null && data.response.msg != '0') {
                 console.log("1; " + data.toString())
-                /*parent.layer.open({
-                    title: '导入提示信息'
-                    , content: "操作成功, " + data.msg + "条非本省数据!",
-                    btnAlign: 'c'
-                });*/
+
                 finalContent += data.response.msg;
                 // 有条数提示 并且全部完成
                 if (index == data.files.length) {
@@ -123,7 +119,7 @@ function initUpload() {
                     parent.layer.open({
                         title: ['导入提示信息', 'text-align: center']
                         , icon: 7
-                        , content: "操作成功 <br/>" + finalContent,
+                        , content: "操作成功, " + data.response.msg,
                         btnAlign: 'c'
                     });
                     parent.reLoad();

+ 6 - 4
src/main/resources/static/js/appjs/datas/dataSendProvince/batchAdd.js

@@ -21,10 +21,12 @@ function save() {
         },
         success: function (data) {
             if (data.code == 0) {
-                parent.layer.msg("操作成功");
-                parent.reLoad();
-                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(index);
+                console.log("1; " + data.toString())
+                parent.layer.open({
+                    title: '导入提示信息'
+                    , content: "操作成功, " + data.msg,
+                    btnAlign: 'c'
+                });
 
             } else {
                 parent.layer.alert(data.msg)

+ 1 - 2
src/main/resources/static/js/appjs/datas/dataSendProvince/dataImport.js

@@ -24,7 +24,6 @@ function save() {
 				console.log(data.toString())
 				if (data.msg != null && data.msg != '0') {
 					console.log("1; " + data.toString())
-					// parent.layer.msg("操作成功, " + data.msg + "条非本省数据!");
 					parent.layer.open({
 						title: '导入提示信息'
 						, content: "操作成功, " + data.msg,
@@ -111,7 +110,7 @@ function initUpload() {
 				parent.layer.open({
 					title: ['导入提示信息', 'text-align: center']
 					, icon: 7
-					, content: "操作成功 <br/>" + finalContent,
+					, content:  "操作成功, " + data.response.msg,
 					btnAlign: 'c'
 				});
 				parent.reLoad();

+ 1 - 2
src/main/resources/static/js/appjs/datas/gyDataImport/batchAdd.js

@@ -24,7 +24,6 @@ function save() {
                 console.log(data.toString())
                 if (data.msg != null && data.msg != '0') {
                     console.log("1; " + data.toString())
-                    // parent.layer.msg("操作成功, " + data.msg + "条非本省数据!");
                     parent.layer.open({
                         title: '导入提示信息'
                         , content: "操作成功, " + data.msg,
@@ -109,7 +108,7 @@ function initUpload() {
                     parent.layer.open({
                         title: ['导入提示信息', 'text-align: center']
                         , icon: 7
-                        , content: "操作成功 <br/>" + finalContent,
+                        , content:  "操作成功, " + data.response.msg,
                         btnAlign: 'c'
                     });
                     parent.reLoad();

+ 2 - 3
src/main/resources/static/js/appjs/datas/gyDataImport/dataImport.js

@@ -24,10 +24,9 @@ function save() {
 				console.log(data.toString())
 				if (data.msg != null && data.msg != '0') {
 					console.log("1; " + data.toString())
-					// parent.layer.msg("操作成功, " + data.msg + "条非本省数据!");
 					parent.layer.open({
 						title: '导入提示信息'
-						, content: "操作成功, " + data.msg + "条非本省数据!",
+						, content: "操作成功, " + data.msg,
 						btnAlign: 'c'
 					});
 				} else {
@@ -111,7 +110,7 @@ function initUpload() {
 				parent.layer.open({
 					title: ['导入提示信息', 'text-align: center']
 					, icon: 7
-					, content: "操作成功 <br/>" + finalContent,
+					, content:  "操作成功, " + data.response.msg,
 					btnAlign: 'c'
 				});
 				parent.reLoad();