Merge branch 'feature/soft_delete' into 'wrdp'

删除work改为软删除

See merge request o2oa/o2oa!1890

o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json

@@ -245,6 +245,8 @@
   "resetWork": {"uri": "/jaxrs/task/{id}/reset", "method": "PUT"},
 
   "deleteWork": {"uri": "/jaxrs/work/{id}", "method": "DELETE"},
+  "abandoned": {"uri": "/jaxrs/snap/work/{workId}/type/abandoned"},
+
 
   "getJobByWorkAssignForm": {"uri": "/jaxrs/work/{id}/complex/appoint/form/{formTag}"},
   "getJobByWorkAssignFormMobile": {"uri": "/jaxrs/work/{id}/complex/appoint/form/{formTag}/mobile"},

o2web/source/x_component_process_Xform/Form.js

@@ -3814,12 +3814,14 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
             this.doDeleteDraftWork(success, failure);
         } else {
             if (this.businessData.control["allowDelete"]) {
-                this.workAction.deleteWork(function (json) {
+                //this.workAction.deleteWork(function (json) {
+                this.workAction.abandoned(function (json) {
                     if (success) success(json);
                 }.bind(this), function (xhr, text, error) {
                     if (failure) failure(xhr, text, error);
                 }, this.businessData.work.id);
-            } else {
+            //}
+            }else {
                 if (failure) failure(null, "Permission Denied", "");
             }
         }