eoss-mobiles 0.2.80 → 0.2.82

package/lib/checkbox.js

@@ -1629,7 +1629,7 @@ var initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身
 var getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据

package/lib/config/api.js

@@ -16,7 +16,7 @@ var initRetrialAuth = exports.initRetrialAuth = '/sso2/retrialAuth/initRetrialAu
 var getRetrialAuthCode = exports.getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = exports.codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = exports.selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = exports.selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据

package/lib/eoss-mobile.common.js

@@ -3060,7 +3060,7 @@ var initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身
 var getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据
@@ -9799,8 +9799,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
     if (this.full && !this.height) {
       this.$nextTick(function () {
-        console.log(_this.$refs.emTable.clientHeight, 'emTable');
-        _this.height = _this.page ? _this.$refs.emTable.clientHeight - 40 : _this.$refs.emTable.clientHeight;
+        _this.tableClientHeight = _this.page ? _this.$refs.emTable.clientHeight - 40 : _this.$refs.emTable.clientHeight;
         // this. = this.$refs.emTable.clientHeight - 40;
       });
     }
@@ -10514,7 +10513,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       ref: 'emTable',
       class: 'em-table-box',
       style: {
-        height: this.isForm ? '100%' : '0',
+        height: '100%',
         position: 'relative'
       }
     }, tableContents);
@@ -14178,8 +14177,8 @@ var StartFlow_component = normalizeComponent(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=e381b4bc&
-var Handlevue_type_template_id_e381b4bc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=8b3b97b8&
+var Handlevue_type_template_id_8b3b97b8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14317,6 +14316,39 @@ var Handlevue_type_template_id_e381b4bc_render = function () {
                                     expression: "addSignUserSelectList",
                                   },
                                 }),
+                                _vm.isCanPreAddSign
+                                  ? _c(
+                                      "em-input",
+                                      { attrs: { label: "加签模式" } },
+                                      [
+                                        _c(
+                                          "template",
+                                          { slot: "input" },
+                                          [
+                                            _c("em-radio-group", {
+                                              attrs: {
+                                                direction: "horizontal",
+                                                data: _vm.AddSignList,
+                                              },
+                                              model: {
+                                                value: _vm.form.addSignMode,
+                                                callback: function ($$v) {
+                                                  _vm.$set(
+                                                    _vm.form,
+                                                    "addSignMode",
+                                                    $$v
+                                                  )
+                                                },
+                                                expression: "form.addSignMode",
+                                              },
+                                            }),
+                                          ],
+                                          1
+                                        ),
+                                      ],
+                                      2
+                                    )
+                                  : _vm._e(),
                               ],
                               1
                             )
@@ -15227,11 +15259,11 @@ var Handlevue_type_template_id_e381b4bc_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_e381b4bc_staticRenderFns = []
-Handlevue_type_template_id_e381b4bc_render._withStripped = true
+var Handlevue_type_template_id_8b3b97b8_staticRenderFns = []
+Handlevue_type_template_id_8b3b97b8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=e381b4bc&
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=8b3b97b8&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=0b9b17d6&
 var Rejectvue_type_template_id_0b9b17d6_render = function () {
@@ -16327,6 +16359,15 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -16374,7 +16415,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     var _ref;
 
     return _ref = {
+      AddSignList: [{ name: '前置加签', value: 'preAddSign' }, { name: '后置加签', value: 'postAddSign' }],
       nextNodeDefault: 0,
+      isCanPreAddSign: false,
       showAppUnit: false, // 弹窗单位
       handleFlow: true,
       isReject: false,
@@ -16394,6 +16437,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       isHiddenOftenOpinion: undefined, //是否隐藏常用意见
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
+        addSignMode: 'postAddSign',
         opinion: undefined, // 审批意见
         isImageOpinion: 0,
         isAddSign: undefined, //是否加签
@@ -16605,10 +16649,10 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.$toast('请选择办理人');
         return;
       }
-      if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
-        this.$toast('请选择办理人');
-        return;
-      }
+      // if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
+      //   this.$toast('请选择办理人');
+      //   return;
+      // }
       if (!this.form.nextNodeId && this.nodeList && this.nodeList.length > 0 && this.isSpecial && !this.isReject && this.isShowNode) {
         this.$toast('请选择流程节点');
         return;
@@ -16693,6 +16737,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       _that.form.userId = _that.userId || util.getStorage('userId');
       _that.form.mobileKey = util.getStorage('deviceId') || '123';
       _that.form.nextNodeId = _that.form.nextOperate == 0 || _that.form.nextOperate == 1 ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode : '';
+      if (!_that.isCanPreAddSign) {
+        delete _that.form.addSignMode;
+      }
       var formData = new FormData();
       if (_that.form.isImageOpinion == 1) {
         formData.append('file', _that.file);
@@ -16953,9 +17000,11 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
                 currentOrgName = _res$data.currentOrgName,
                 otherOrgName = _res$data.otherOrgName,
                 defaultNotificationMessage = _res$data.defaultNotificationMessage,
-                defaultNotificationType = _res$data.defaultNotificationType;
+                defaultNotificationType = _res$data.defaultNotificationType,
+                isCanPreAddSign = _res$data.isCanPreAddSign;
 
             that.currentOrgName = currentOrgName;
+            that.isCanPreAddSign = isCanPreAddSign;
             that.otherOrgName = otherOrgName;
             that.taskExamineInfo = taskExamine;
             that.form.isReturnSubmitter = taskExamine.isReturnSubmitter;
@@ -17289,8 +17338,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = normalizeComponent(
   components_Handlevue_type_script_lang_js_,
-  Handlevue_type_template_id_e381b4bc_render,
-  Handlevue_type_template_id_e381b4bc_staticRenderFns,
+  Handlevue_type_template_id_8b3b97b8_render,
+  Handlevue_type_template_id_8b3b97b8_staticRenderFns,
   false,
   null,
   null,
@@ -24198,7 +24247,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.2.80',
+  version: '0.2.82',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-btn.js

@@ -1629,7 +1629,7 @@ var initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身
 var getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据

package/lib/flow-list.js

@@ -1629,7 +1629,7 @@ var initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身
 var getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据

package/lib/flow.js

@@ -1626,7 +1626,7 @@ var initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身
 var getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
-var selectObject = '/sys/v1/mecpSys/selectObject.json';
+var selectObject = '/sys/v1/mecpSys/selectObject.dhtml';
 // // 获取代码表数据
 // export const findSysCode = '/api/v1/mecpSys/findSysCode.json';
 // 获取代码表数据
@@ -3632,8 +3632,8 @@ var StartFlow_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=e381b4bc&
-var Handlevue_type_template_id_e381b4bc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=8b3b97b8&
+var Handlevue_type_template_id_8b3b97b8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3771,6 +3771,39 @@ var Handlevue_type_template_id_e381b4bc_render = function () {
                                     expression: "addSignUserSelectList",
                                   },
                                 }),
+                                _vm.isCanPreAddSign
+                                  ? _c(
+                                      "em-input",
+                                      { attrs: { label: "加签模式" } },
+                                      [
+                                        _c(
+                                          "template",
+                                          { slot: "input" },
+                                          [
+                                            _c("em-radio-group", {
+                                              attrs: {
+                                                direction: "horizontal",
+                                                data: _vm.AddSignList,
+                                              },
+                                              model: {
+                                                value: _vm.form.addSignMode,
+                                                callback: function ($$v) {
+                                                  _vm.$set(
+                                                    _vm.form,
+                                                    "addSignMode",
+                                                    $$v
+                                                  )
+                                                },
+                                                expression: "form.addSignMode",
+                                              },
+                                            }),
+                                          ],
+                                          1
+                                        ),
+                                      ],
+                                      2
+                                    )
+                                  : _vm._e(),
                               ],
                               1
                             )
@@ -4681,11 +4714,11 @@ var Handlevue_type_template_id_e381b4bc_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_e381b4bc_staticRenderFns = []
-Handlevue_type_template_id_e381b4bc_render._withStripped = true
+var Handlevue_type_template_id_8b3b97b8_staticRenderFns = []
+Handlevue_type_template_id_8b3b97b8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=e381b4bc&
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=8b3b97b8&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=0b9b17d6&
 var Rejectvue_type_template_id_0b9b17d6_render = function () {
@@ -5781,6 +5814,15 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5828,7 +5870,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     var _ref;
 
     return _ref = {
+      AddSignList: [{ name: '前置加签', value: 'preAddSign' }, { name: '后置加签', value: 'postAddSign' }],
       nextNodeDefault: 0,
+      isCanPreAddSign: false,
       showAppUnit: false, // 弹窗单位
       handleFlow: true,
       isReject: false,
@@ -5848,6 +5892,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       isHiddenOftenOpinion: undefined, //是否隐藏常用意见
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
+        addSignMode: 'postAddSign',
         opinion: undefined, // 审批意见
         isImageOpinion: 0,
         isAddSign: undefined, //是否加签
@@ -6059,10 +6104,10 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.$toast('请选择办理人');
         return;
       }
-      if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
-        this.$toast('请选择办理人');
-        return;
-      }
+      // if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
+      //   this.$toast('请选择办理人');
+      //   return;
+      // }
       if (!this.form.nextNodeId && this.nodeList && this.nodeList.length > 0 && this.isSpecial && !this.isReject && this.isShowNode) {
         this.$toast('请选择流程节点');
         return;
@@ -6147,6 +6192,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       _that.form.userId = _that.userId || util["a" /* default */].getStorage('userId');
       _that.form.mobileKey = util["a" /* default */].getStorage('deviceId') || '123';
       _that.form.nextNodeId = _that.form.nextOperate == 0 || _that.form.nextOperate == 1 ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode : '';
+      if (!_that.isCanPreAddSign) {
+        delete _that.form.addSignMode;
+      }
       var formData = new FormData();
       if (_that.form.isImageOpinion == 1) {
         formData.append('file', _that.file);
@@ -6407,9 +6455,11 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
                 currentOrgName = _res$data.currentOrgName,
                 otherOrgName = _res$data.otherOrgName,
                 defaultNotificationMessage = _res$data.defaultNotificationMessage,
-                defaultNotificationType = _res$data.defaultNotificationType;
+                defaultNotificationType = _res$data.defaultNotificationType,
+                isCanPreAddSign = _res$data.isCanPreAddSign;
 
             that.currentOrgName = currentOrgName;
+            that.isCanPreAddSign = isCanPreAddSign;
             that.otherOrgName = otherOrgName;
             that.taskExamineInfo = taskExamine;
             that.form.isReturnSubmitter = taskExamine.isReturnSubmitter;
@@ -6743,8 +6793,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = Object(componentNormalizer["a" /* default */])(
   components_Handlevue_type_script_lang_js_,
-  Handlevue_type_template_id_e381b4bc_render,
-  Handlevue_type_template_id_e381b4bc_staticRenderFns,
+  Handlevue_type_template_id_8b3b97b8_render,
+  Handlevue_type_template_id_8b3b97b8_staticRenderFns,
   false,
   null,
   null,