Explorar el Código

修改生单的功能。

YangZhiJie hace 2 años
padre
commit
69f4e46da8

+ 1 - 1
src/api/workflow/WorkflowResource.js

@@ -836,7 +836,7 @@ export default {
    * 启动工作流 
    * 启动工作流 
    */
    */
   startWorkflow: function (workflowStartParam) {
   startWorkflow: function (workflowStartParam) {
-    var requestUrl = 'WorkflowResource/startWorkflow';
+    var requestUrl = 'WorkflowExtResource/startWorkflow';
 
 
 
 
     return new Promise((resolve, reject) => {
     return new Promise((resolve, reject) => {

+ 4 - 14
src/common/Common.js

@@ -126,32 +126,22 @@ export default{
   },
   },
 
 
   // 获取图片路径
   // 获取图片路径
-  getImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('#accountId');
+  getImageSrc: function (className, imageName) {  
     if (imageName == null) {
     if (imageName == null) {
       return null;
       return null;
     }
     }
-    if (imageName != null && imageName[0] == '/') {
-      return this.getFileServerUrl() + 'Files/' + accountId + '/Images/' + className + imageName;
-    } else {
-      return this.getFileServerUrl() + 'Files/' + accountId + '/Images/' + className + '/' + imageName;
-    }
+    return '/api/file/imageDownload?className=' + className + '&fileName=' + imageName;
   },
   },
 
 
 
 
   // 获取略缩图图片路径
   // 获取略缩图图片路径
   getThumbnailImageSrc: function (className, imageName) {
   getThumbnailImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('#accountId');
     if (imageName == null) {
     if (imageName == null) {
       return null;
       return null;
     }
     }
-    if (imageName != null && imageName[0] == '/') {
-      return this.getFileServerUrl() + 'Files/' + accountId + '/Images/' + className + '/thumbnail' + imageName;
-    } else {
-      return this.getFileServerUrl() + 'Files/' + accountId + '/Images/' + className + '/thumbnail/' + imageName;
-    }
+    return '/api/file/thumbnailImageDownload?className=' + className + '&fileName=' + imageName;
   },
   },
-
+  
   /**
   /**
    * 获取附件的路径
    * 获取附件的路径
    * @param  {[type]} className [description]
    * @param  {[type]} className [description]

+ 4 - 1
src/components/GenerateDocumentTool.vue

@@ -71,7 +71,10 @@ export default {
         Notify.error('提示', '未选择任何数据。', false);
         Notify.error('提示', '未选择任何数据。', false);
         return;
         return;
       }
       }
-      let modelData = IFrameUtil.getCurdModelData();
+      // window.open调用
+      let modelData = window.opener.getModelData();
+      // 模态框 iframe调用
+      //let modelData =  IFrameUtil.getCurdModelData();
       let url = null;
       let url = null;
 
 
       if (_self.type == 'purchaseRequest') {
       if (_self.type == 'purchaseRequest') {