Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW014.java

@@ -292,7 +292,7 @@ public class ServiceHGCW014 extends ServiceBase {
             for (int i = 0; i < resultRows.size(); i++) {
                 HGCW014 HGCW014 = new HGCW014();
                 HGCW014.fromMap(resultRows.get(i));
-                if (!HGCW014.getReviewStatus().equals(ReviewStatusEnum.UNREVIEWED.getCode())){
+                if (HGCW014.getReviewStatus().equals(ReviewStatusEnum.UNREVIEWED.getCode())){
                     throw new RuntimeException("当前状态为未审核提交，请先审核提交！");
                 }
                 HGCW014.setCancelStatus(2);

src/main/webapp/HG/CW/HGCW014.js

@@ -177,7 +177,7 @@ function submitFunc() {
             message("选中的第"+(index+1)+"行未保存的数据，请先保存！");
             flag = false;
         }
-        if (row.reviewStatus == "3") {
+        if (row.reviewStatus == "1") {
             message("勾选的数据中有已经提交的单据！");
             flag = false;
             return;

src/main/webapp/HG/WD/HGWD001.js

@@ -308,7 +308,9 @@ $(function () {
                         title: "<div style='text-align: center;'>文档权限管理</div>",
                         width: "90%",
                         height: "90%",
-                        callbackName: editCallback
+                        callbackName: function () {
+                            editCallback($("#inqu_status-0-orgParentId").val());
+                        }
                     });
                 })
 

src/main/webapp/HG/WD/HGWD001H.js

@@ -64,8 +64,7 @@ let save = function () {
                 function (e) {
                     var status = e.status;
                     if (status !== -1) {
-                        let fileId = $("#inqu_status-0-fileId").val();
-                        parent.JSColorbox.setValueCallback(fileId);
+                        parent.JSColorbox.setValueCallback();
                     }
                 });
         }
@@ -98,8 +97,7 @@ let auth = function () {
  * 授权回调
  */
 let authCallback = function (res) {
-    let fileId = $("#inqu_status-0-fileId").val();
-    parent.JSColorbox.setValueCallback(fileId);
+    parent.JSColorbox.setValueCallback();
     // 刷新页面
     query();
 
@@ -120,7 +118,12 @@ let removeUser = function () {
     JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"取消授权用户\"操作? ", {
         ok: function () {
             JSUtils.submitGridsData("result", "HGWD003", "removeUser",
-                true
+                true,function (e) {
+                    var status = e.status;
+                    if (status !== -1) {
+                        parent.JSColorbox.setValueCallback();
+                    }
+                }
             );
         }
     });