ecinc-cloud-wappaio 9.0.136 → 9.0.138

package/lib/ecwappaio.common.js

@@ -10811,7 +10811,7 @@ var actions = {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(99521);
+/* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(89406);
 var defaultSettings = __webpack_require__(47710);
 var showTopMenus = defaultSettings.showTopMenus.showTopMenus;
 
@@ -11359,7 +11359,7 @@ var actions = {
 
 /***/ }),
 
-/***/ 99521:
+/***/ 89406:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13316,8 +13316,8 @@ var ModuleMenu_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var ModuleMenu = (ModuleMenu_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=template&id=0b0dd7d3&scoped=true
-var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=template&id=6bf27af0&scoped=true
+var FrameLoadervue_type_template_id_6bf27af0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.showToolbar ? _c('div', {
@@ -13346,7 +13346,7 @@ var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render = function rende
     }
   })])]);
 };
-var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns = [];
+var FrameLoadervue_type_template_id_6bf27af0_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=script&lang=js
 /* harmony default export */ var FrameLoadervue_type_script_lang_js = ({
@@ -13376,20 +13376,25 @@ var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns = [];
   mounted: function mounted() {
     var _this = this;
     this.$refs['iframe'].onload = function () {
-      if (_this.showToolbar) {
-        _this.$refs['iframe'].height = document.querySelector('.app-main').clientHeight - 50 - 72;
-      } else {
-        _this.$refs['iframe'].height = document.querySelector('.app-main').clientHeight - 54 - 20;
-      }
-      _this.showFrame = true;
+      setTimeout(function () {
+        var frameHeight = document.querySelector('.app-main').clientHeight;
+        if (_this.showToolbar) {
+          frameHeight = frameHeight - 50 - 72;
+        } else {
+          frameHeight = frameHeight - 54 - 20;
+        }
+        _this.$refs['iframe'].style.height = frameHeight + 'px';
+        _this.$refs['iframe'].style.minHeight = 'unset';
+        _this.showFrame = true;
+      }, 1000);
     };
   }
 });
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=script&lang=js
  /* harmony default export */ var src_FrameLoadervue_type_script_lang_js = (FrameLoadervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=0b0dd7d3&prod&scoped=true&lang=scss
-var FrameLoadervue_type_style_index_0_id_0b0dd7d3_prod_scoped_true_lang_scss = __webpack_require__(31263);
-;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=0b0dd7d3&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=6bf27af0&prod&scoped=true&lang=scss
+var FrameLoadervue_type_style_index_0_id_6bf27af0_prod_scoped_true_lang_scss = __webpack_require__(34083);
+;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=6bf27af0&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue
 
@@ -13402,11 +13407,11 @@ var FrameLoadervue_type_style_index_0_id_0b0dd7d3_prod_scoped_true_lang_scss = _
 
 var FrameLoader_component = (0,componentNormalizer/* default */.A)(
   src_FrameLoadervue_type_script_lang_js,
-  FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render,
-  FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns,
+  FrameLoadervue_type_template_id_6bf27af0_scoped_true_render,
+  FrameLoadervue_type_template_id_6bf27af0_scoped_true_staticRenderFns,
   false,
   null,
-  "0b0dd7d3",
+  "6bf27af0",
   null
   
 )
@@ -41192,7 +41197,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-7f8f55b3] .el-dialog__body{min
 
 /***/ }),
 
-/***/ 64129:
+/***/ 60105:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -41206,7 +41211,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-0b0dd7d3]{margin-top:100px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-6bf27af0]{margin-top:100px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -219526,19 +219531,19 @@ var update = add("1e00bb33", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 31263:
+/***/ 34083:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(64129);
+var content = __webpack_require__(60105);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("63eed248", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0af4c498", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -228192,19 +228197,19 @@ var wfengine_install = function install(Vue) {
             var attachShortName = $scope.attachments[i].fileName.substring(0, $scope.attachments[i].fileName.lastIndexOf('.'));
             if ($scope.attachments[i].fileType.toUpperCase() === 'BODY') {
               if (attachShortName === bydyShortName || $scope.attachments[i].originalName.split('.')[0] === bydyShortName) {
-                // pdf格式优先、无修订DOC优先
-                if ($scope.bodyfile === undefined || $scope.bodyfile === null || $scope.attachments[i].originalName.indexOf('.pdf') !== -1 || $scope.attachments[i].filePath.indexOf('/noTracks/') !== -1) {
+                // pdf格式优先
+                if (!$scope.bodyfile || $scope.attachments[i].originalName.indexOf('.pdf') !== -1) {
                   $scope.bodyfile = $scope.attachments[i];
                 }
               }
-              if ($scope.attachments[i].originalName.indexOf('.doc') !== -1 && $scope.attachments[i].originalName.split('.')[0] === $scope.wfInstance.bodyDocId && $scope.attachments[i].filePath.indexOf('/noTracks/') === -1) {
+              if ($scope.attachments[i].originalName.indexOf('.doc') !== -1 && $scope.attachments[i].originalName.split('.')[0] === $scope.wfInstance.bodyDocId) {
                 canEditBodyfile = true;
               }
             }
           }
-          if ($scope.bodyfile === undefined || $scope.bodyfile === null) {
+          if (!$scope.bodyfile) {
             for (var _i = 0; _i < $scope.attachments.length; _i++) {
-              if ($scope.attachments[_i].fileType.toUpperCase() === 'BODY' && ($scope.attachments[_i].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i].filePath.indexOf('/noTracks/') !== -1)) {
+              if ($scope.attachments[_i].fileType.toUpperCase() === 'BODY' && $scope.attachments[_i].originalName.indexOf('.pdf') !== -1) {
                 $scope.bodyfile = $scope.attachments[_i];
               }
             }
@@ -228216,14 +228221,15 @@ var wfengine_install = function install(Vue) {
         } else {
           for (var _i2 = 0; _i2 < $scope.attachments.length; _i2++) {
             if ($scope.attachments[_i2].fileType.toUpperCase() === 'BODY') {
-              console.log($scope.attachments[_i2]);
-              if ($scope.attachments[_i2].originalName.split('.')[0] === $scope.wfInstance.bodyDocId && (!$scope.bodyfile || $scope.bodyfile.fileName.indexOf('RedTitle_') === -1 && $scope.bodyfile.fileName.indexOf('SignedFile_') === -1)) {
-                if ($scope.bodyfile === undefined || $scope.bodyfile === null || $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i2].filePath.indexOf('/noTracks/') !== -1) {
+              if ($scope.attachments[_i2].originalName.split('.')[0] === $scope.wfInstance.bodyDocId) {
+                if (!$scope.bodyfile || $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i2].filePath.indexOf('/noTracks/') !== -1) {
                   // pdf格式优先、无修订DOC优先
                   $scope.bodyfile = $scope.attachments[_i2];
                 }
               } else if ($scope.attachments[_i2].fileName.indexOf('RedTitle_') === 0 && $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1) {
                 $scope.bodyfile = $scope.attachments[_i2];
+              } else if ($scope.attachments[_i2].fileName.indexOf('NoTracks_') === 0 && $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1) {
+                $scope.bodyfile = $scope.attachments[_i2];
               } else if ($scope.attachments[_i2].fileName.indexOf('SignedFile_') === 0) {
                 $scope.bodyfile = $scope.attachments[_i2];
               }
@@ -265300,7 +265306,7 @@ var ResRoles_RolePermissionForm = RolePermissionForm;
 var ResRoles_PermissionMatrixMgr = PermissionMatrixMgr;
 var ResRoles_RoleMgr = RoleMgr;
 // EXTERNAL MODULE: ./packages/ecwplat/Module/index.js + 22 modules
-var Module = __webpack_require__(99521);
+var Module = __webpack_require__(89406);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Organ/src/ImportPersonOrg.vue?vue&type=template&id=24d72210&scoped=true
 var ImportPersonOrgvue_type_template_id_24d72210_scoped_true_render = function render() {
   var _vm = this,

package/lib/ecwappaio.umd.js

@@ -10821,7 +10821,7 @@ var actions = {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17716);
+/* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(60983);
 var defaultSettings = __webpack_require__(53844);
 var showTopMenus = defaultSettings.showTopMenus.showTopMenus;
 
@@ -11369,7 +11369,7 @@ var actions = {
 
 /***/ }),
 
-/***/ 17716:
+/***/ 60983:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13326,8 +13326,8 @@ var ModuleMenu_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var ModuleMenu = (ModuleMenu_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=template&id=0b0dd7d3&scoped=true
-var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=template&id=6bf27af0&scoped=true
+var FrameLoadervue_type_template_id_6bf27af0_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.showToolbar ? _c('div', {
@@ -13356,7 +13356,7 @@ var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render = function rende
     }
   })])]);
 };
-var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns = [];
+var FrameLoadervue_type_template_id_6bf27af0_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=script&lang=js
 /* harmony default export */ var FrameLoadervue_type_script_lang_js = ({
@@ -13386,20 +13386,25 @@ var FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns = [];
   mounted: function mounted() {
     var _this = this;
     this.$refs['iframe'].onload = function () {
-      if (_this.showToolbar) {
-        _this.$refs['iframe'].height = document.querySelector('.app-main').clientHeight - 50 - 72;
-      } else {
-        _this.$refs['iframe'].height = document.querySelector('.app-main').clientHeight - 54 - 20;
-      }
-      _this.showFrame = true;
+      setTimeout(function () {
+        var frameHeight = document.querySelector('.app-main').clientHeight;
+        if (_this.showToolbar) {
+          frameHeight = frameHeight - 50 - 72;
+        } else {
+          frameHeight = frameHeight - 54 - 20;
+        }
+        _this.$refs['iframe'].style.height = frameHeight + 'px';
+        _this.$refs['iframe'].style.minHeight = 'unset';
+        _this.showFrame = true;
+      }, 1000);
     };
   }
 });
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=script&lang=js
  /* harmony default export */ var src_FrameLoadervue_type_script_lang_js = (FrameLoadervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=0b0dd7d3&prod&scoped=true&lang=scss
-var FrameLoadervue_type_style_index_0_id_0b0dd7d3_prod_scoped_true_lang_scss = __webpack_require__(31261);
-;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=0b0dd7d3&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=6bf27af0&prod&scoped=true&lang=scss
+var FrameLoadervue_type_style_index_0_id_6bf27af0_prod_scoped_true_lang_scss = __webpack_require__(84677);
+;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue?vue&type=style&index=0&id=6bf27af0&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/FrameLoader.vue
 
@@ -13412,11 +13417,11 @@ var FrameLoadervue_type_style_index_0_id_0b0dd7d3_prod_scoped_true_lang_scss = _
 
 var FrameLoader_component = (0,componentNormalizer/* default */.A)(
   src_FrameLoadervue_type_script_lang_js,
-  FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_render,
-  FrameLoadervue_type_template_id_0b0dd7d3_scoped_true_staticRenderFns,
+  FrameLoadervue_type_template_id_6bf27af0_scoped_true_render,
+  FrameLoadervue_type_template_id_6bf27af0_scoped_true_staticRenderFns,
   false,
   null,
-  "0b0dd7d3",
+  "6bf27af0",
   null
   
 )
@@ -41202,7 +41207,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-7f8f55b3] .el-dialog__body{min
 
 /***/ }),
 
-/***/ 673:
+/***/ 96649:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -41216,7 +41221,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-0b0dd7d3]{margin-top:100px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".loading[data-v-6bf27af0]{margin-top:100px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -219536,19 +219541,19 @@ var update = add("9db78e12", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 31261:
+/***/ 84677:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(673);
+var content = __webpack_require__(96649);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("e2d48cc0", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("68fc3148", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -228202,19 +228207,19 @@ var wfengine_install = function install(Vue) {
             var attachShortName = $scope.attachments[i].fileName.substring(0, $scope.attachments[i].fileName.lastIndexOf('.'));
             if ($scope.attachments[i].fileType.toUpperCase() === 'BODY') {
               if (attachShortName === bydyShortName || $scope.attachments[i].originalName.split('.')[0] === bydyShortName) {
-                // pdf格式优先、无修订DOC优先
-                if ($scope.bodyfile === undefined || $scope.bodyfile === null || $scope.attachments[i].originalName.indexOf('.pdf') !== -1 || $scope.attachments[i].filePath.indexOf('/noTracks/') !== -1) {
+                // pdf格式优先
+                if (!$scope.bodyfile || $scope.attachments[i].originalName.indexOf('.pdf') !== -1) {
                   $scope.bodyfile = $scope.attachments[i];
                 }
               }
-              if ($scope.attachments[i].originalName.indexOf('.doc') !== -1 && $scope.attachments[i].originalName.split('.')[0] === $scope.wfInstance.bodyDocId && $scope.attachments[i].filePath.indexOf('/noTracks/') === -1) {
+              if ($scope.attachments[i].originalName.indexOf('.doc') !== -1 && $scope.attachments[i].originalName.split('.')[0] === $scope.wfInstance.bodyDocId) {
                 canEditBodyfile = true;
               }
             }
           }
-          if ($scope.bodyfile === undefined || $scope.bodyfile === null) {
+          if (!$scope.bodyfile) {
             for (var _i = 0; _i < $scope.attachments.length; _i++) {
-              if ($scope.attachments[_i].fileType.toUpperCase() === 'BODY' && ($scope.attachments[_i].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i].filePath.indexOf('/noTracks/') !== -1)) {
+              if ($scope.attachments[_i].fileType.toUpperCase() === 'BODY' && $scope.attachments[_i].originalName.indexOf('.pdf') !== -1) {
                 $scope.bodyfile = $scope.attachments[_i];
               }
             }
@@ -228226,14 +228231,15 @@ var wfengine_install = function install(Vue) {
         } else {
           for (var _i2 = 0; _i2 < $scope.attachments.length; _i2++) {
             if ($scope.attachments[_i2].fileType.toUpperCase() === 'BODY') {
-              console.log($scope.attachments[_i2]);
-              if ($scope.attachments[_i2].originalName.split('.')[0] === $scope.wfInstance.bodyDocId && (!$scope.bodyfile || $scope.bodyfile.fileName.indexOf('RedTitle_') === -1 && $scope.bodyfile.fileName.indexOf('SignedFile_') === -1)) {
-                if ($scope.bodyfile === undefined || $scope.bodyfile === null || $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i2].filePath.indexOf('/noTracks/') !== -1) {
+              if ($scope.attachments[_i2].originalName.split('.')[0] === $scope.wfInstance.bodyDocId) {
+                if (!$scope.bodyfile || $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1 || $scope.attachments[_i2].filePath.indexOf('/noTracks/') !== -1) {
                   // pdf格式优先、无修订DOC优先
                   $scope.bodyfile = $scope.attachments[_i2];
                 }
               } else if ($scope.attachments[_i2].fileName.indexOf('RedTitle_') === 0 && $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1) {
                 $scope.bodyfile = $scope.attachments[_i2];
+              } else if ($scope.attachments[_i2].fileName.indexOf('NoTracks_') === 0 && $scope.attachments[_i2].originalName.indexOf('.pdf') !== -1) {
+                $scope.bodyfile = $scope.attachments[_i2];
               } else if ($scope.attachments[_i2].fileName.indexOf('SignedFile_') === 0) {
                 $scope.bodyfile = $scope.attachments[_i2];
               }
@@ -265310,7 +265316,7 @@ var ResRoles_RolePermissionForm = RolePermissionForm;
 var ResRoles_PermissionMatrixMgr = PermissionMatrixMgr;
 var ResRoles_RoleMgr = RoleMgr;
 // EXTERNAL MODULE: ./packages/ecwplat/Module/index.js + 22 modules
-var Module = __webpack_require__(17716);
+var Module = __webpack_require__(60983);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Organ/src/ImportPersonOrg.vue?vue&type=template&id=24d72210&scoped=true
 var ImportPersonOrgvue_type_template_id_24d72210_scoped_true_render = function render() {
   var _vm = this,