eoss-mobiles 0.3.45 → 0.3.47

package/lib/checkbox.js

@@ -1746,7 +1746,7 @@ var toTaskStartDraft = activiti + mecp + '/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
 // export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 // 联合用印
 var toTaskUnionSeal = activiti + mecp + '/bpmBackend/toTaskUnionSeal';
 // 联合用印提交

package/lib/config/api.js

@@ -87,7 +87,7 @@ var toTaskStartDraft = exports.toTaskStartDraft = activiti + mecp + '/bpmBackend
 
 // 稿件递送提交接口
 // export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = exports.taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = exports.taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 // 联合用印
 var toTaskUnionSeal = exports.toTaskUnionSeal = activiti + mecp + '/bpmBackend/toTaskUnionSeal';
 // 联合用印提交

package/lib/eoss-mobile.common.js

@@ -2150,8 +2150,8 @@ mainvue_type_template_id_17308961_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=42906bb4
-var selector_treevue_type_template_id_42906bb4_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=67a0c96c
+var selector_treevue_type_template_id_67a0c96c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2334,11 +2334,11 @@ var selector_treevue_type_template_id_42906bb4_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_42906bb4_staticRenderFns = []
-selector_treevue_type_template_id_42906bb4_render._withStripped = true
+var selector_treevue_type_template_id_67a0c96c_staticRenderFns = []
+selector_treevue_type_template_id_67a0c96c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=42906bb4
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=67a0c96c
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=53316a9f
 var treevue_type_template_id_53316a9f_render = function () {
@@ -3255,7 +3255,7 @@ var toTaskStartDraft = activiti + mecp + '/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
 // export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 // 联合用印
 var toTaskUnionSeal = activiti + mecp + '/bpmBackend/toTaskUnionSeal';
 // 联合用印提交
@@ -4326,7 +4326,6 @@ var _props, _methods;
         this.newParam.pid = 'root';
         this.newParam.myUserid = this.newParam.myUserid || util["a" /* default */].getStorage('userId');
       } else {
-
         this.newParam = _extends({}, this.newParam, this.newTabs[this.selectIndex].param, this.newParam[this.newTabs[this.selectIndex].name] ? this.newParam[this.newTabs[this.selectIndex].name] : {});
         if (this.param.pid) {
           this.newParam.pid = this.param.pid;
@@ -4657,8 +4656,8 @@ var _props, _methods;
 
 var selector_tree_component = normalizeComponent(
   src_selector_treevue_type_script_lang_js,
-  selector_treevue_type_template_id_42906bb4_render,
-  selector_treevue_type_template_id_42906bb4_staticRenderFns,
+  selector_treevue_type_template_id_67a0c96c_render,
+  selector_treevue_type_template_id_67a0c96c_staticRenderFns,
   false,
   null,
   null,
@@ -13937,8 +13936,8 @@ var Opinion_component = normalizeComponent(
 )
 
 /* harmony default export */ var Opinion = (Opinion_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/Message.vue?vue&type=template&id=587552f7
-var Messagevue_type_template_id_587552f7_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/Message.vue?vue&type=template&id=71bbfff1
+var Messagevue_type_template_id_71bbfff1_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14036,11 +14035,11 @@ var Messagevue_type_template_id_587552f7_render = function () {
     1
   )
 }
-var Messagevue_type_template_id_587552f7_staticRenderFns = []
-Messagevue_type_template_id_587552f7_render._withStripped = true
+var Messagevue_type_template_id_71bbfff1_staticRenderFns = []
+Messagevue_type_template_id_71bbfff1_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Message.vue?vue&type=template&id=587552f7
+// CONCATENATED MODULE: ./packages/flow/src/components/Message.vue?vue&type=template&id=71bbfff1
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Message.vue?vue&type=script&lang=js
 //
@@ -14170,6 +14169,7 @@ Messagevue_type_template_id_587552f7_render._withStripped = true
     },
     // 监听默认消息类型
     defaultNotificationType: function defaultNotificationType(val) {
+      console.log('监听了', val);
       if (val) {
         var arr = [];
         this.newList.map(function (item) {
@@ -14270,8 +14270,8 @@ Messagevue_type_template_id_587552f7_render._withStripped = true
 
 var Message_component = normalizeComponent(
   components_Messagevue_type_script_lang_js,
-  Messagevue_type_template_id_587552f7_render,
-  Messagevue_type_template_id_587552f7_staticRenderFns,
+  Messagevue_type_template_id_71bbfff1_render,
+  Messagevue_type_template_id_71bbfff1_staticRenderFns,
   false,
   null,
   null,
@@ -16954,8 +16954,8 @@ Handlevue_type_template_id_4ec2a437_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=4ec2a437
 
-// 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=db352326
-var Rejectvue_type_template_id_db352326_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/Reject.vue?vue&type=template&id=4dfae864
+var Rejectvue_type_template_id_4dfae864_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -16999,16 +16999,18 @@ var Rejectvue_type_template_id_db352326_render = function () {
                       "template",
                       { slot: "input" },
                       [
-                        _c("em-radio-group", {
-                          attrs: { data: _vm.rejectObj },
-                          model: {
-                            value: _vm.form.nextNodeId,
-                            callback: function ($$v) {
-                              _vm.$set(_vm.form, "nextNodeId", $$v)
-                            },
-                            expression: "form.nextNodeId",
-                          },
-                        }),
+                        _vm.rejectObj && _vm.rejectObj.length > 0
+                          ? _c("em-radio-group", {
+                              attrs: { data: _vm.rejectObj },
+                              model: {
+                                value: _vm.form.nextNodeId,
+                                callback: function ($$v) {
+                                  _vm.$set(_vm.form, "nextNodeId", $$v)
+                                },
+                                expression: "form.nextNodeId",
+                              },
+                            })
+                          : _c("span", [_vm._v("暂无可驳回节点及对象")]),
                       ],
                       1
                     ),
@@ -17018,20 +17020,23 @@ var Rejectvue_type_template_id_db352326_render = function () {
               ],
               1
             ),
-            _c("Message", {
-              ref: "message",
-              attrs: {
-                code: "notification_type",
-                baseUrl: _vm.baseUrl,
-                readOnlyNotificationType: _vm.readOnlyNotificationType,
-                notificationMessageReadOnly: _vm.notificationMessageReadOnly,
-                defaultNotificationType: _vm.defaultNotificationType,
-                defaultNotificationMsg: _vm.form.notificationMsg,
-                pendingId: _vm.pendingId,
-                type: _vm.type,
-              },
-              on: { onInputMsg: _vm.onInputMsg },
-            }),
+            _vm.rejectObj && _vm.rejectObj.length != 0
+              ? _c("Message", {
+                  ref: "message",
+                  attrs: {
+                    code: "notification_type",
+                    baseUrl: _vm.baseUrl,
+                    readOnlyNotificationType: _vm.readOnlyNotificationType,
+                    notificationMessageReadOnly:
+                      _vm.notificationMessageReadOnly,
+                    defaultNotificationType: _vm.defaultNotificationType,
+                    defaultNotificationMsg: _vm.form.notificationMsg,
+                    pendingId: _vm.pendingId,
+                    type: _vm.type,
+                  },
+                  on: { onInputMsg: _vm.onInputMsg },
+                })
+              : _vm._e(),
           ],
           1
         ),
@@ -17039,12 +17044,27 @@ var Rejectvue_type_template_id_db352326_render = function () {
       1
     ),
     _c("div", { staticClass: "btn-list" }, [
-      _c("div", { staticClass: "btn", on: { click: _vm.goBack } }, [
-        _vm._v("取消"),
-      ]),
       _c(
         "div",
         {
+          class:
+            "btn " +
+            (_vm.rejectObj && _vm.rejectObj.length == 0 ? "btn-cancel" : ""),
+          on: { click: _vm.goBack },
+        },
+        [_vm._v("取消")]
+      ),
+      _c(
+        "div",
+        {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: _vm.rejectObj && _vm.rejectObj.length != 0,
+              expression: "rejectObj && rejectObj.length != 0",
+            },
+          ],
           staticClass: "btn",
           on: {
             click: function ($event) {
@@ -17057,11 +17077,11 @@ var Rejectvue_type_template_id_db352326_render = function () {
     ]),
   ])
 }
-var Rejectvue_type_template_id_db352326_staticRenderFns = []
-Rejectvue_type_template_id_db352326_render._withStripped = true
+var Rejectvue_type_template_id_4dfae864_staticRenderFns = []
+Rejectvue_type_template_id_4dfae864_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Reject.vue?vue&type=template&id=db352326
+// CONCATENATED MODULE: ./packages/flow/src/components/Reject.vue?vue&type=template&id=4dfae864
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=script&lang=js
 var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -17113,6 +17133,8 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
 
 
 
@@ -17343,8 +17365,8 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Reject_component = normalizeComponent(
   components_Rejectvue_type_script_lang_js,
-  Rejectvue_type_template_id_db352326_render,
-  Rejectvue_type_template_id_db352326_staticRenderFns,
+  Rejectvue_type_template_id_4dfae864_render,
+  Rejectvue_type_template_id_4dfae864_staticRenderFns,
   false,
   null,
   null,
@@ -21093,8 +21115,8 @@ var TaskRead_component = normalizeComponent(
 )
 
 /* harmony default export */ var TaskRead = (TaskRead_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/taskUnionExamine.vue?vue&type=template&id=43bad746
-var taskUnionExaminevue_type_template_id_43bad746_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/taskUnionExamine.vue?vue&type=template&id=4d677906
+var taskUnionExaminevue_type_template_id_4d677906_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -21223,9 +21245,9 @@ var taskUnionExaminevue_type_template_id_43bad746_render = function () {
                     readOnlyNotificationType: _vm.readOnlyNotificationType,
                     notificationMessageReadOnly:
                       _vm.notificationMessageReadOnly,
-                    defaultNotificationType: _vm.infoList.noticeType,
                     defaultNotificationMsg: _vm.infoList.noticeInfo,
                     pendingId: _vm.pendingId,
+                    defaultNotificationType: _vm.infoList.noticeType,
                   },
                   on: { onInputMsg: _vm.onInputMsg },
                 })
@@ -21255,13 +21277,16 @@ var taskUnionExaminevue_type_template_id_43bad746_render = function () {
     ]),
   ])
 }
-var taskUnionExaminevue_type_template_id_43bad746_staticRenderFns = []
-taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
+var taskUnionExaminevue_type_template_id_4d677906_staticRenderFns = []
+taskUnionExaminevue_type_template_id_4d677906_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/taskUnionExamine.vue?vue&type=template&id=43bad746
+// CONCATENATED MODULE: ./packages/flow/src/components/taskUnionExamine.vue?vue&type=template&id=4d677906
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/taskUnionExamine.vue?vue&type=script&lang=js
+var taskUnionExaminevue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+//
 //
 //
 //
@@ -21377,6 +21402,7 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
     appId: { type: String, default: '' },
     defaultOpinion: { type: String, default: '' },
     userId: { type: String, default: '' },
+    selectorParams: { type: Object, default: function _default() {} },
     // disabled: { type: Boolean, default: false },
     // multiple: { type: Boolean, default: true },
     baseUrl: { type: String, default: '' },
@@ -21409,7 +21435,8 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
-        noticeType: '',
+        noticeType: [],
+        newNoticeType: [],
         noticeInfo: '',
         opinion: ''
       },
@@ -21440,6 +21467,10 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
     this.style = {
       'padding-top': sessionStorage.getItem('pt') ? sessionStorage.getItem('pt') + 'px' : '30px'
     };
+    this.otherParams.myUserid = this.params.myUserid = util["a" /* default */].getStorage('userId') || this.userId || '';
+    this.params.nofilid = this.otherParams.nofilid = this.orgId || JOSN.parse(util["a" /* default */].getStorage('userInfo')).orgId || this.userId || '';
+    this.params = taskUnionExaminevue_type_script_lang_js_extends({}, this.params, this.selectorParams);
+    this.otherParams = taskUnionExaminevue_type_script_lang_js_extends({}, this.otherParams, this.selectorParams);
     // this.newMultiple = this.multiple;
     if (this.type === 'taskReview') return this.getTaskReview();
     if (this.type === 'takeAdvice') return this.getIsCanStartSubFlow();
@@ -21534,6 +21565,7 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
         _this3.$toast.clear();
         if (status === 'success') {
           _this3.infoList.noticeType = message.split(',');
+          console.log(_this3.infoList.noticeType, ' this.infoList.noticeType');
         } else {
           _this3.$toast(message || '系统错误，请联系管理员！');
         }
@@ -21716,7 +21748,7 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
 
     // 通知消息回调
     onInputMsg: function onInputMsg(obj) {
-      this.infoList.noticeType = JSON.parse(JSON.stringify(obj.notificationType));
+      this.infoList.newNoticeType = JSON.parse(JSON.stringify(obj.notificationType));
       this.infoList.noticeInfo = obj.notificationMsg;
     },
     goBack: function goBack() {
@@ -21737,8 +21769,8 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
       var _infoList = this.infoList,
           nextCurrentOrgObj = _infoList.nextCurrentOrgObj,
           nextOtherOrgObj = _infoList.nextOtherOrgObj,
-          noticeType = _infoList.noticeType,
           noticeInfo = _infoList.noticeInfo,
+          newNoticeType = _infoList.newNoticeType,
           isImageOpinion = this.isImageOpinion,
           file = this.file,
           isOpinionRequired = this.isOpinionRequired,
@@ -21769,11 +21801,12 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
         nextOtherOrgObj: Array.isArray(nextOtherOrgObj) ? nextOtherOrgObj.join(',') : nextOtherOrgObj,
         nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj) ? nextCurrentOrgObj.join(',') : nextCurrentOrgObj,
         notificationMsg: noticeInfo,
-        notificationType: noticeType.join(','),
+        notificationType: newNoticeType.join(','),
         choiceDeptId: choiceDeptId,
         isSubFlow: isSubFlow,
         choiceOrgId: choiceOrgId,
         userId: this.userId || util["a" /* default */].getStorage('userId'),
+        loginType: 2, //登录方式
         mobileKey: util["a" /* default */].getStorage('deviceId') || '123'
       };
       var formData = new FormData();
@@ -21897,8 +21930,8 @@ taskUnionExaminevue_type_template_id_43bad746_render._withStripped = true
 
 var taskUnionExamine_component = normalizeComponent(
   components_taskUnionExaminevue_type_script_lang_js,
-  taskUnionExaminevue_type_template_id_43bad746_render,
-  taskUnionExaminevue_type_template_id_43bad746_staticRenderFns,
+  taskUnionExaminevue_type_template_id_4d677906_render,
+  taskUnionExaminevue_type_template_id_4d677906_staticRenderFns,
   false,
   null,
   null,
@@ -29311,7 +29344,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.3.45',
+  version: '0.3.47',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-btn.js

@@ -1746,7 +1746,7 @@ var toTaskStartDraft = activiti + mecp + '/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
 // export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 // 联合用印
 var toTaskUnionSeal = activiti + mecp + '/bpmBackend/toTaskUnionSeal';
 // 联合用印提交

package/lib/flow-list.js

@@ -1743,7 +1743,7 @@ var toTaskStartDraft = activiti + mecp + '/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
 // export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 // 联合用印
 var toTaskUnionSeal = activiti + mecp + '/bpmBackend/toTaskUnionSeal';
 // 联合用印提交