eoss-mobiles 0.2.5 → 0.2.7

package/lib/flow.js

@@ -1571,8 +1571,9 @@ var registerNew = '/api/v1/mecpItask/registerNew.json';
 // 获取节点信息(获取节点属性及办理人,发起)
 var getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
 // 获取发起流程信息
+// export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
 var toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
-// export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlow';
+// export const toStartFlow = activiti + mecp + '/bpmBackend/toStartFlowIndex';
 
 // 驳回(为H5提供接口)
 // export const taskRejectHtml = '/api/mecp/v1/mecpItask/taskRejectHtml.json';
@@ -1671,8 +1672,10 @@ http.interceptors.request.use(function (config) {
       config.data = external_qs_default.a.stringify(data);
     } else {
       config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      Object.assign(data, config.data);
-      config.data = external_qs_default.a.stringify(data);
+      if (Object.prototype.toString.call(config.data).slice(8, -1).toLowerCase() !== 'formdata') {
+        Object.assign(data, config.data);
+        config.data = external_qs_default.a.stringify(data);
+      }
     }
   } else {
     Object.assign(config.params, data);
@@ -2040,8 +2043,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=56353196&
 
-// 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/StartFlow.vue?vue&type=template&id=1ab5f2f0&
-var StartFlowvue_type_template_id_1ab5f2f0_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/StartFlow.vue?vue&type=template&id=5b4823aa&
+var StartFlowvue_type_template_id_5b4823aa_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2061,6 +2064,7 @@ var StartFlowvue_type_template_id_1ab5f2f0_render = function () {
               attrs: {
                 code: _vm.processObj.attachedCode,
                 ownId: _vm.businessId,
+                esign: _vm.esign,
                 isFile: false,
                 baseUrl: _vm.baseUrl,
                 isOpinionRequired: _vm.isOpinionRequired,
@@ -2247,11 +2251,11 @@ var StartFlowvue_type_template_id_1ab5f2f0_render = function () {
     ]),
   ])
 }
-var StartFlowvue_type_template_id_1ab5f2f0_staticRenderFns = []
-StartFlowvue_type_template_id_1ab5f2f0_render._withStripped = true
+var StartFlowvue_type_template_id_5b4823aa_staticRenderFns = []
+StartFlowvue_type_template_id_5b4823aa_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=1ab5f2f0&
+// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=5b4823aa&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -2259,8 +2263,8 @@ var api = __webpack_require__(2);
 // EXTERNAL MODULE: ./src/utils/http.js + 1 modules
 var http = __webpack_require__(3);
 
-// 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/Opinion.vue?vue&type=template&id=37d0b4da&
-var Opinionvue_type_template_id_37d0b4da_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/Opinion.vue?vue&type=template&id=7bc36072&
+var Opinionvue_type_template_id_7bc36072_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2275,60 +2279,158 @@ var Opinionvue_type_template_id_37d0b4da_render = function () {
           attrs: { type: _vm.isFile ? "haveFile" : "noHaveFile" },
         },
         [
-          _c(
-            "div",
-            { staticClass: "item" },
-            [
-              _c("em-input", {
-                attrs: {
-                  label: _vm.label,
-                  placeholder: _vm.placeholder,
-                  type: "textarea",
-                  rows: "3",
-                  disabled: _vm.disabled || _vm.fixedDisabled,
-                  required: _vm.isOpinionRequired == 1 ? true : false,
-                },
-                on: { input: _vm.onInput },
-                model: {
-                  value: _vm.opinion,
-                  callback: function ($$v) {
-                    _vm.opinion = $$v
-                  },
-                  expression: "opinion",
-                },
-              }),
-            ],
-            1
-          ),
-          _vm.opinionList.length > 0 && _vm.isHiddenOftenOpinion
+          _vm.esign
             ? _c(
                 "div",
-                { staticClass: "item" },
                 [
-                  _c("em-input", {
-                    attrs: {
-                      "label-width": "100%",
-                      readonly: "",
-                      placeholder: "请选择常用语",
-                      label: "请选择常用语",
-                    },
-                    on: {
-                      click: function ($event) {
-                        _vm.showPicker = true
-                      },
-                    },
-                    model: {
-                      value: _vm.selectOpinion,
-                      callback: function ($$v) {
-                        _vm.selectOpinion = $$v
+                  _c(
+                    "em-tabs",
+                    {
+                      on: { change: _vm.handleChange },
+                      model: {
+                        value: _vm.isImageOpinion,
+                        callback: function ($$v) {
+                          _vm.isImageOpinion = $$v
+                        },
+                        expression: "isImageOpinion",
                       },
-                      expression: "selectOpinion",
                     },
-                  }),
+                    _vm._l(_vm.tabs, function (item) {
+                      return _c(
+                        "em-tab",
+                        {
+                          key: item.id,
+                          attrs: { title: item.text, name: item.type },
+                        },
+                        [
+                          _c("em-esign", {
+                            directives: [
+                              {
+                                name: "show",
+                                rawName: "v-show",
+                                value: _vm.isImageOpinion === 1,
+                                expression: "isImageOpinion === 1",
+                              },
+                            ],
+                            staticStyle: { padding: "0px 10px" },
+                            attrs: { "file-path": _vm.esignPath },
+                            on: { save: _vm.handleSave },
+                          }),
+                          _c(
+                            "div",
+                            {
+                              directives: [
+                                {
+                                  name: "show",
+                                  rawName: "v-show",
+                                  value: _vm.isImageOpinion === 0,
+                                  expression: "isImageOpinion === 0",
+                                },
+                              ],
+                              staticClass: "item em-flow-opion-box",
+                              staticStyle: { "padding-bottom": "20px" },
+                            },
+                            [
+                              _c("em-input", {
+                                attrs: {
+                                  label: _vm.label,
+                                  placeholder: _vm.placeholder,
+                                  type: "textarea",
+                                  rows: "3",
+                                  disabled: _vm.disabled || _vm.fixedDisabled,
+                                  required:
+                                    _vm.isOpinionRequired == 1 ? true : false,
+                                },
+                                on: { input: _vm.onInput },
+                                model: {
+                                  value: _vm.opinion,
+                                  callback: function ($$v) {
+                                    _vm.opinion = $$v
+                                  },
+                                  expression: "opinion",
+                                },
+                              }),
+                              _vm.opinionList.length > 0 &&
+                              _vm.isHiddenOftenOpinion
+                                ? _c(
+                                    "span",
+                                    {
+                                      staticClass: "em-flow-opion",
+                                      on: {
+                                        click: function ($event) {
+                                          _vm.showPicker = true
+                                        },
+                                      },
+                                    },
+                                    [
+                                      _vm._v("常见意见 "),
+                                      _c("i", {
+                                        staticClass: "iconfont icon-youjiantou",
+                                      }),
+                                    ]
+                                  )
+                                : _vm._e(),
+                            ],
+                            1
+                          ),
+                        ],
+                        1
+                      )
+                    }),
+                    1
+                  ),
                 ],
                 1
               )
-            : _vm._e(),
+            : _c("div", [
+                _c(
+                  "div",
+                  {
+                    staticClass: "item em-flow-opion-box",
+                    staticStyle: { "padding-bottom": "20px" },
+                  },
+                  [
+                    _c("em-input", {
+                      attrs: {
+                        label: _vm.label,
+                        placeholder: _vm.placeholder,
+                        type: "textarea",
+                        rows: "3",
+                        disabled: _vm.disabled || _vm.fixedDisabled,
+                        required: _vm.isOpinionRequired == 1 ? true : false,
+                      },
+                      on: { input: _vm.onInput },
+                      model: {
+                        value: _vm.opinion,
+                        callback: function ($$v) {
+                          _vm.opinion = $$v
+                        },
+                        expression: "opinion",
+                      },
+                    }),
+                    _vm.opinionList.length > 0 && _vm.isHiddenOftenOpinion
+                      ? _c(
+                          "span",
+                          {
+                            staticClass: "em-flow-opion",
+                            on: {
+                              click: function ($event) {
+                                _vm.showPicker = true
+                              },
+                            },
+                          },
+                          [
+                            _vm._v("常见意见 "),
+                            _c("i", {
+                              staticClass: "iconfont icon-youjiantou",
+                            }),
+                          ]
+                        )
+                      : _vm._e(),
+                  ],
+                  1
+                ),
+              ]),
         ]
       ),
       _vm.isFile
@@ -2364,11 +2466,11 @@ var Opinionvue_type_template_id_37d0b4da_render = function () {
     1
   )
 }
-var Opinionvue_type_template_id_37d0b4da_staticRenderFns = []
-Opinionvue_type_template_id_37d0b4da_render._withStripped = true
+var Opinionvue_type_template_id_7bc36072_staticRenderFns = []
+Opinionvue_type_template_id_7bc36072_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Opinion.vue?vue&type=template&id=37d0b4da&
+// CONCATENATED MODULE: ./packages/flow/src/components/Opinion.vue?vue&type=template&id=7bc36072&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Opinion.vue?vue&type=script&lang=js&
 //
@@ -2420,6 +2522,53 @@ Opinionvue_type_template_id_37d0b4da_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -2459,6 +2608,10 @@ Opinionvue_type_template_id_37d0b4da_render._withStripped = true
       default: function _default() {
         return [];
       }
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   // components: {
@@ -2467,9 +2620,12 @@ Opinionvue_type_template_id_37d0b4da_render._withStripped = true
   data: function data() {
     return {
       opinion: '',
-      selectOpinion: '',
       fixedDisabled: false,
       showPicker: false,
+      esignPath: '',
+      tabs: [{ id: 0, text: '键盘签批', type: 0 }, { id: 1, text: '手写签批', type: 1 }],
+      isImageOpinion: 0,
+      file: '',
       opinionList: [] //意见列表
     };
   },
@@ -2483,6 +2639,27 @@ Opinionvue_type_template_id_37d0b4da_render._withStripped = true
   },
 
   methods: {
+    handleSave: function handleSave(info) {
+      var isImageOpinion = this.isImageOpinion;
+
+      this.esignPath = info.data;
+      this.file = info.file;
+      this.$emit('onInputOpintion', {
+        opinion: this.opinion,
+        isImageOpinion: isImageOpinion,
+        file: info.file
+      });
+    },
+    handleChange: function handleChange() {
+      var isImageOpinion = this.isImageOpinion,
+          file = this.file;
+
+      this.$emit('onInputOpintion', {
+        opinion: this.opinion,
+        isImageOpinion: isImageOpinion,
+        file: file
+      });
+    },
     handleClose: function handleClose() {
       this.showPicker = false;
     },
@@ -2504,13 +2681,15 @@ Opinionvue_type_template_id_37d0b4da_render._withStripped = true
 
     // 将input的值传递到父组件
     onInput: function onInput(val) {
+      var isImageOpinion = this.isImageOpinion,
+          file = this.file;
+
       this.opinion = typeof val === 'string' ? val : val.content;
-      if (typeof val != 'string') {
-        this.selectOpinion = val.content;
-      } else {
-        this.selectOpinion = '';
-      }
-      this.$emit('onInputOpintion', typeof val === 'string' ? val : val.content);
+      this.$emit('onInputOpintion', {
+        opinion: this.opinion,
+        isImageOpinion: isImageOpinion,
+        file: file
+      });
       this.showPicker = false;
     }
   }
@@ -2530,8 +2709,8 @@ var componentNormalizer = __webpack_require__(0);
 
 var component = Object(componentNormalizer["a" /* default */])(
   components_Opinionvue_type_script_lang_js_,
-  Opinionvue_type_template_id_37d0b4da_render,
-  Opinionvue_type_template_id_37d0b4da_staticRenderFns,
+  Opinionvue_type_template_id_7bc36072_render,
+  Opinionvue_type_template_id_7bc36072_staticRenderFns,
   false,
   null,
   null,
@@ -2760,8 +2939,7 @@ var Message_component = Object(componentNormalizer["a" /* default */])(
 var external_eoss_mobile_vant_ = __webpack_require__(6);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/StartFlow.vue?vue&type=script&lang=js&
-var _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; };
-
+//
 //
 //
 //
@@ -2893,6 +3071,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data: function data() {
@@ -2907,8 +3089,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         opinion: undefined, // 审批意见
         nodeId: undefined,
         notificationMsg: undefined, //系统消息
-        notificationType: []
+        notificationType: [],
+        isImageOpinion: 0
       },
+      file: '',
       nextUserList: [],
       isChooseNextNode: 0,
       isOpinionRequired: 0, //办理意见是否必填
@@ -2939,6 +3123,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   mounted: function mounted() {
     var obj = {
       processDefinitionId: this.defId,
+      // isOnly: true,
+      // hideTempSave: true,
       businessId: this.businessId
     };
     this.geAllData(obj);
@@ -2989,13 +3175,23 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
     // 意见回调
     onInputOpintion: function onInputOpintion(val) {
-      this.form.opinion = val;
+      var opinion = val.opinion,
+          isImageOpinion = val.isImageOpinion,
+          file = val.file;
+
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
 
     // 提交流程
     onSubmit: function onSubmit() {
       var _this2 = this;
 
+      if (!this.form.opinion && this.isOpinionRequired == 1 && this.form.isImageOpinion == 0 || !this.file && this.isOpinionRequired == 1 && this.form.isImageOpinion == 1) {
+        this.$toast('请选择输入审批意见');
+        return;
+      }
       if (!this.form.nextUserId) {
         this.$toast('请选择办理人');
         return;
@@ -3004,10 +3200,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         this.$toast('请选择流程节点');
         return;
       }
-      if (!this.form.opinion && this.isOpinionRequired == 1) {
-        this.$toast('请选择输入审批意见');
-        return;
-      }
       // if (!this.form.notificationType) {
       //   this.$toast('请选择通知消息');
       //   return;
@@ -3023,12 +3215,23 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         nodeId: this.form.nodeId,
         userId: sessionStorage.getItem('userId'),
         notificationMsg: this.form.notificationMsg,
-        loginType: 2 //登录方式
+        loginType: 2, //登录方式
+        isImageOpinion: this.form.isImageOpinion
       };
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
         return;
       }
+      var formData = new FormData();
+      if (this.form.isImageOpinion == 1) {
+        formData.append('file', this.file);
+      }
+      formData.append('pendingId', this.pendingId);
+      for (var key in info) {
+        if (info[key] !== '' && info[key] !== undefined) {
+          formData.append(key, info[key]);
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -3040,7 +3243,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       Object(http["a" /* default */])({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + api["j" /* registerNew */] : api["j" /* registerNew */],
         type: 'post',
-        params: _extends({}, info)
+        params: formData
       }).then(function (res) {
         _this2.$toast.clear();
         if (res.rCode == 0) {
@@ -3246,8 +3449,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var StartFlow_component = Object(componentNormalizer["a" /* default */])(
   components_StartFlowvue_type_script_lang_js_,
-  StartFlowvue_type_template_id_1ab5f2f0_render,
-  StartFlowvue_type_template_id_1ab5f2f0_staticRenderFns,
+  StartFlowvue_type_template_id_5b4823aa_render,
+  StartFlowvue_type_template_id_5b4823aa_staticRenderFns,
   false,
   null,
   null,
@@ -3256,8 +3459,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=870cfad8&
-var Handlevue_type_template_id_870cfad8_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=37ffcb14&
+var Handlevue_type_template_id_37ffcb14_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3290,6 +3493,7 @@ var Handlevue_type_template_id_870cfad8_render = function () {
                     attrs: {
                       code: _vm.processObj.attachedCode,
                       ownId: _vm.pendingId,
+                      esign: _vm.esign,
                       isOpinionRequired: _vm.isOpinionRequired,
                       disabled: _vm.isBanInputOpinion != 0,
                       baseUrl: _vm.baseUrl,
@@ -3529,33 +3733,62 @@ var Handlevue_type_template_id_870cfad8_render = function () {
                                           "div",
                                           { staticClass: "item" },
                                           [
-                                            _c("em-picker", {
-                                              attrs: {
-                                                title: "下步操作",
-                                                label: "下步操作",
-                                                required: "",
-                                                "show-toolbar": "",
-                                                "label-width": "100%",
-                                                columns: _vm.taskOperations,
-                                                "value-key": "key",
-                                                "label-key": "value",
-                                              },
-                                              on: {
-                                                confirm: _vm.changeNextOperate,
-                                              },
-                                              model: {
-                                                value: _vm.form.nextOperateName,
-                                                callback: function ($$v) {
-                                                  _vm.$set(
-                                                    _vm.form,
-                                                    "nextOperateName",
-                                                    $$v
-                                                  )
+                                            _c(
+                                              "em-input",
+                                              {
+                                                attrs: {
+                                                  value: "下步操作",
+                                                  label: "下步操作",
+                                                  required: "",
+                                                  disabled: true,
+                                                  "label-position": "top",
                                                 },
-                                                expression:
-                                                  "form.nextOperateName",
                                               },
-                                            }),
+                                              [
+                                                _c(
+                                                  "template",
+                                                  { slot: "input" },
+                                                  _vm._l(
+                                                    _vm.taskOperations,
+                                                    function (item) {
+                                                      return _c(
+                                                        "span",
+                                                        {
+                                                          key: item.key,
+                                                          staticClass:
+                                                            "em-flow-tag",
+                                                          class: {
+                                                            "em-flow-tag-active":
+                                                              _vm.tagKey ===
+                                                              item.key,
+                                                          },
+                                                          on: {
+                                                            click: function (
+                                                              $event
+                                                            ) {
+                                                              _vm.changeNextOperate(
+                                                                item
+                                                              )
+                                                            },
+                                                          },
+                                                        },
+                                                        [
+                                                          _vm._v(
+                                                            "\n                " +
+                                                              _vm._s(
+                                                                item.value
+                                                              ) +
+                                                              "\n              "
+                                                          ),
+                                                        ]
+                                                      )
+                                                    }
+                                                  ),
+                                                  0
+                                                ),
+                                              ],
+                                              2
+                                            ),
                                           ],
                                           1
                                         )
@@ -4238,14 +4471,14 @@ var Handlevue_type_template_id_870cfad8_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_870cfad8_staticRenderFns = []
-Handlevue_type_template_id_870cfad8_render._withStripped = true
+var Handlevue_type_template_id_37ffcb14_staticRenderFns = []
+Handlevue_type_template_id_37ffcb14_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=870cfad8&
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=37ffcb14&
 
-// 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=244de01c&
-var Rejectvue_type_template_id_244de01c_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=3c26866b&
+var Rejectvue_type_template_id_3c26866b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4262,6 +4495,7 @@ var Rejectvue_type_template_id_244de01c_render = function () {
           attrs: {
             code: _vm.processObj.attachedCode,
             ownId: _vm.$route.query.pendingId,
+            esign: _vm.esign,
             isOpinionRequired: _vm.isBanInputOpinion,
             disabled: _vm.isBanInputOpinion != 0,
             baseUrl: _vm.baseUrl,
@@ -4340,14 +4574,14 @@ var Rejectvue_type_template_id_244de01c_render = function () {
     ]),
   ])
 }
-var Rejectvue_type_template_id_244de01c_staticRenderFns = []
-Rejectvue_type_template_id_244de01c_render._withStripped = true
+var Rejectvue_type_template_id_3c26866b_staticRenderFns = []
+Rejectvue_type_template_id_3c26866b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Reject.vue?vue&type=template&id=244de01c&
+// CONCATENATED MODULE: ./packages/flow/src/components/Reject.vue?vue&type=template&id=3c26866b&
 
 // 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; };
+var _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; };
 
 //
 //
@@ -4390,6 +4624,7 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
 
 
 
@@ -4403,7 +4638,11 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
     pendingId: String,
     userId: String,
     beforeSubmit: Function,
-    baseUrl: String
+    baseUrl: String,
+    esign: {
+      type: Boolean,
+      default: false
+    }
   },
   data: function data() {
     return {
@@ -4413,8 +4652,10 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
         opinion: undefined, // 审批意见
         notificationMsg: undefined, //系统消息
         nextNodeId: undefined,
-        loginType: 2 //登录方式
+        loginType: 2, //登录方式
+        isImageOpinion: 0
       },
+      file: '',
       processObj: {
         taskExamine: { nodeName: undefined },
         nodeInfoMap: { nextUserList: [] }
@@ -4445,7 +4686,13 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 意见回调
     onInputOpintion: function onInputOpintion(val) {
-      this.form.opinion = val;
+      var opinion = val.opinion,
+          isImageOpinion = val.isImageOpinion,
+          file = val.file;
+
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
     goBack: function goBack() {
       this.$parent.$emit('close');
@@ -4456,8 +4703,8 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
     onSubmit: function onSubmit() {
       var _this = this;
 
-      if (!this.form.opinion && this.isBanInputOpinion == 0) {
-        this.$toast('请选择输入审批意见');
+      if (!this.form.opinion && this.isBanInputOpinion == 0 && this.form.isImageOpinion == 0 || !this.file && this.isBanInputOpinion == 0 && this.form.isImageOpinion == 1) {
+        this.$toast('请输入审批意见');
         return;
       }
       var str = '';
@@ -4468,9 +4715,19 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
         this.form.opinion = this.nodeDefaultRejectOpinion;
       }
       if (this.beforeSubmit) {
-        this.beforeSubmit(Rejectvue_type_script_lang_js_extends({ pendingId: this.pendingId }, this.form));
+        this.beforeSubmit(_extends({ pendingId: this.pendingId }, this.form));
         return;
       }
+      var formData = new FormData();
+      if (this.form.isImageOpinion == 1) {
+        formData.append('file', this.file);
+      }
+      formData.append('pendingId', this.pendingId);
+      for (var key in this.form) {
+        if (this.form[key] !== '' && this.form[key] !== undefined) {
+          formData.append(key, this.form[key]);
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -4482,9 +4739,7 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
       Object(http["a" /* default */])({
         url: _that.baseUrl ? _that.baseUrl + api["n" /* taskRejectHtml */] : api["n" /* taskRejectHtml */],
         type: 'post',
-        params: Rejectvue_type_script_lang_js_extends({
-          pendingId: _that.pendingId
-        }, this.form)
+        params: formData
       }).then(function (res) {
         if (res.status == 'success') {
           _this.$toast('操作成功');
@@ -4578,8 +4833,8 @@ var Rejectvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Reject_component = Object(componentNormalizer["a" /* default */])(
   components_Rejectvue_type_script_lang_js_,
-  Rejectvue_type_template_id_244de01c_render,
-  Rejectvue_type_template_id_244de01c_staticRenderFns,
+  Rejectvue_type_template_id_3c26866b_render,
+  Rejectvue_type_template_id_3c26866b_staticRenderFns,
   false,
   null,
   null,
@@ -5259,6 +5514,20 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5287,6 +5556,10 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data: function data() {
@@ -5311,6 +5584,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
         opinion: undefined, // 审批意见
+        isImageOpinion: 0,
         isAddSign: undefined, //是否加签
         addSignUserId: undefined, //加签人员id
         isRemoveSign: undefined, //是否减签
@@ -5352,7 +5626,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         advanceNoticeType: [] //催办通知方式
       },
       isCanFenyue: '0'
-    }, _ref['isChooseNextNode'] = 1, _ref.isOpinionRequired = 0, _ref.isBanInputOpinion = 0, _ref.showTimeList = false, _ref.timeList = [], _ref.nextUserList = [], _ref.nextCurrentOrgObjSelect = [], _ref.nextOtherOrgObjSelect = [], _ref.nextReadUserSelectList = [], _ref.addSignUserSelectList = [], _ref.removeSignUserSelectList = [], _ref.nextUserSelectList = [], _ref.showAppUser = false, _ref.showNextOperate = false, _ref.showNextNodeList = false, _ref.nodeList = [], _ref.selectList = [], _ref.opinionList = [], _ref.processObj = { taskExamine: { nodeName: undefined } }, _ref.peopleObj = {}, _ref.userInfo = {}, _ref.isCanAddSign = false, _ref.isCanRemoveSign = false, _ref.isSpecial = true, _ref.taskOperations = [], _ref.countersignaturetypeCode = false, _ref.countersignaturetypeText = undefined, _ref.isCustomPreset = true, _ref.isHideCurrentOrg = false, _ref.isHideOtherOrg = false, _ref.isHandleExplain = false, _ref.isTaskread = false, _ref.defaultNotificationType = undefined, _ref.selectUnitType = 'department', _ref.isHiddenNextStepInfo = false, _ref.presetEdit = true, _ref.isLimitedTimeHandling = false, _ref.userSelectionType = undefined, _ref.orgSelectionType = undefined, _ref.notificationType = undefined, _ref.nodeType = undefined, _ref.deptRoleCode = undefined, _ref.orgRoleCode = undefined, _ref.appointNotUserIds = undefined, _ref.handleRoleId = undefined, _ref.nextRole = undefined, _ref.filterCandinateIds = undefined, _ref.selectorDefShowDeptId = undefined, _ref.isRadio = true, _ref.otherOrgName = undefined, _ref.currentOrgName = undefined, _ref.isMainSubProcess = false, _ref.isNextUser = false, _ref.isDealObject = false, _ref.isDealRole = false, _ref.nextUserflag = false, _ref.isSubmitButtonShowAgreeAndDisagree = 0, _ref.isCustomUserClick = false, _ref.timeListLable = undefined, _ref.nodeDefaultSubmitOpinion = undefined, _ref.isCustomUser = 0, _ref.choiceOrgId = '', _ref.choiceDeptId = '', _ref.taskExamineInfo = {}, _ref.nodeInfoMapInfo = {}, _ref.isEndUserTask = '', _ref.pOrgId = '', _ref;
+    }, _ref['isChooseNextNode'] = 1, _ref.isOpinionRequired = 0, _ref.isBanInputOpinion = 0, _ref.showTimeList = false, _ref.timeList = [], _ref.nextUserList = [], _ref.nextCurrentOrgObjSelect = [], _ref.nextOtherOrgObjSelect = [], _ref.nextReadUserSelectList = [], _ref.addSignUserSelectList = [], _ref.removeSignUserSelectList = [], _ref.nextUserSelectList = [], _ref.showAppUser = false, _ref.showNextOperate = false, _ref.showNextNodeList = false, _ref.nodeList = [], _ref.selectList = [], _ref.opinionList = [], _ref.processObj = { taskExamine: { nodeName: undefined } }, _ref.peopleObj = {}, _ref.userInfo = {}, _ref.isCanAddSign = false, _ref.isCanRemoveSign = false, _ref.isSpecial = true, _ref.taskOperations = [], _ref.countersignaturetypeCode = false, _ref.countersignaturetypeText = undefined, _ref.isCustomPreset = true, _ref.isHideCurrentOrg = false, _ref.isHideOtherOrg = false, _ref.isHandleExplain = false, _ref.isTaskread = false, _ref.defaultNotificationType = undefined, _ref.selectUnitType = 'department', _ref.isHiddenNextStepInfo = false, _ref.presetEdit = true, _ref.isLimitedTimeHandling = false, _ref.userSelectionType = undefined, _ref.orgSelectionType = undefined, _ref.notificationType = undefined, _ref.nodeType = undefined, _ref.deptRoleCode = undefined, _ref.orgRoleCode = undefined, _ref.appointNotUserIds = undefined, _ref.handleRoleId = undefined, _ref.nextRole = undefined, _ref.filterCandinateIds = undefined, _ref.selectorDefShowDeptId = undefined, _ref.isRadio = true, _ref.otherOrgName = undefined, _ref.currentOrgName = undefined, _ref.isMainSubProcess = false, _ref.isNextUser = false, _ref.isDealObject = false, _ref.isDealRole = false, _ref.nextUserflag = false, _ref.isSubmitButtonShowAgreeAndDisagree = 0, _ref.isCustomUserClick = false, _ref.timeListLable = undefined, _ref.nodeDefaultSubmitOpinion = undefined, _ref.isCustomUser = 0, _ref.choiceOrgId = '', _ref.choiceDeptId = '', _ref.taskExamineInfo = {}, _ref.nodeInfoMapInfo = {}, _ref.file = '', _ref.isEndUserTask = '', _ref.tagKey = '', _ref.pOrgId = '', _ref;
   },
   created: function created() {
     var _this2 = this;
@@ -5457,6 +5731,15 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         opinion: this.form.opinion,
         taskAction: 'complete'
       };
+      var formData = new FormData();
+      if (this.form.isImageOpinion == 1) {
+        formData.append('file', this.file);
+      }
+      for (var key in params) {
+        if (params[key] !== '' && params[key] !== undefined) {
+          formData.append(key, params[key]);
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -5470,7 +5753,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
           Accept: 'application/json,text/plain'
         },
         type: 'post',
-        params: params
+        params: formData
       }).then(function (res) {
         var status = res.status,
             message = res.message;
@@ -5501,6 +5784,10 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         idStr = idStr + r.showid + (i === _this4.nextUserSelectList.length - 1 ? '' : ',');
       });
       this.form.nextUserId = idStr;
+      if (!this.form.opinion && this.isOpinionRequired == 1 && !this.nodeDefaultSubmitOpinion && this.form.isImageOpinion == 0 || !this.file && this.isOpinionRequired == 1 && !this.nodeDefaultSubmitOpinion && this.form.isImageOpinion == 1) {
+        this.$toast('请选择输入审批意见');
+        return;
+      }
       if (this.isSpecial && this.isNextUser && !this.form.nextUserId && idStr === '' && !this.isReject) {
         this.$toast('请选择办理人');
         return;
@@ -5509,10 +5796,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.$toast('请选择流程节点');
         return;
       }
-      if (!this.form.opinion && this.isOpinionRequired == 1 && !this.nodeDefaultSubmitOpinion) {
-        this.$toast('请选择输入审批意见');
-        return;
-      }
+
       var str = '';
       if (this.form.opinion) {
         str = this.form.opinion.replace(/\s+/g, '');
@@ -5588,12 +5872,20 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
       _that.form.nodeId = taskExamineInfo.nodeId;
       _that.form.nextNodeId = _that.form.nextOperate == 0 || _that.form.nextOperate == 1 ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode : '';
+      var formData = new FormData();
+      if (_that.form.isImageOpinion == 1) {
+        formData.append('file', _that.file);
+      }
+      formData.append('pendingId', _that.pendingId);
+      for (var key in _that.form) {
+        if (_that.form[key] !== '' && _that.form[key] !== undefined) {
+          formData.append(key, _that.form[key]);
+        }
+      }
       Object(http["a" /* default */])({
         url: _that.baseUrl ? _that.baseUrl + api["l" /* taskHandleHtml */] : api["l" /* taskHandleHtml */],
         type: 'post',
-        params: Handlevue_type_script_lang_js_extends({
-          pendingId: _that.pendingId
-        }, _that.form)
+        params: formData
       }).then(function (res) {
         _this4.$toast.clear();
         if (res.status == 'success') {
@@ -5643,6 +5935,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 切换下一步操作
     changeNextOperate: function changeNextOperate(val, isDef) {
+      if (!isDef && val.key === this.tagKey) return;
+      this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
       this.isShowNode = false;
@@ -5736,7 +6030,13 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 意见回调
     onInputOpintion: function onInputOpintion(val) {
-      this.form.opinion = val;
+      var opinion = val.opinion,
+          isImageOpinion = val.isImageOpinion,
+          file = val.file;
+
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
 
     // 办理人选择完回调
@@ -6150,8 +6450,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_870cfad8_render,
-  Handlevue_type_template_id_870cfad8_staticRenderFns,
+  Handlevue_type_template_id_37ffcb14_render,
+  Handlevue_type_template_id_37ffcb14_staticRenderFns,
   false,
   null,
   null,
@@ -6806,8 +7106,8 @@ var TaskRead_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* 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=0cefc67d&
-var taskUnionExaminevue_type_template_id_0cefc67d_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=70a11c5a&
+var taskUnionExaminevue_type_template_id_70a11c5a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6821,12 +7121,8 @@ var taskUnionExaminevue_type_template_id_0cefc67d_render = function () {
           _c("div", [_vm._v(_vm._s(_vm.nodeName))]),
         ]),
         _c("Opinion", {
-          attrs: { baseUrl: _vm.baseUrl },
-          on: {
-            onInputOpintion: function (val) {
-              return (_vm.opinion = val)
-            },
-          },
+          attrs: { esign: _vm.esign, baseUrl: _vm.baseUrl },
+          on: { onInputOpintion: _vm.onInputOpintion },
         }),
         _c(
           "div",
@@ -6954,11 +7250,11 @@ var taskUnionExaminevue_type_template_id_0cefc67d_render = function () {
     ]),
   ])
 }
-var taskUnionExaminevue_type_template_id_0cefc67d_staticRenderFns = []
-taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
+var taskUnionExaminevue_type_template_id_70a11c5a_staticRenderFns = []
+taskUnionExaminevue_type_template_id_70a11c5a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/taskUnionExamine.vue?vue&type=template&id=0cefc67d&
+// CONCATENATED MODULE: ./packages/flow/src/components/taskUnionExamine.vue?vue&type=template&id=70a11c5a&
 
 // 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&
 //
@@ -7046,6 +7342,7 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -7068,11 +7365,17 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data: function data() {
     return {
       opinion: '', //办理意见
+      isImageOpinion: 0,
+      file: '',
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -7130,6 +7433,15 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
     }
   },
   methods: {
+    onInputOpintion: function onInputOpintion(val) {
+      var opinion = val.opinion,
+          isImageOpinion = val.isImageOpinion,
+          file = val.file;
+
+      this.opinion = opinion;
+      this.isImageOpinion = isImageOpinion;
+      this.file = file;
+    },
     getIsCanStartSubFlow: function getIsCanStartSubFlow() {
       var _this = this;
 
@@ -7346,6 +7658,8 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
           nextOtherOrgObj = _infoList.nextOtherOrgObj,
           noticeType = _infoList.noticeType,
           noticeInfo = _infoList.noticeInfo,
+          isImageOpinion = this.isImageOpinion,
+          file = this.file,
           isOpinionRequired = this.isOpinionRequired,
           opinion = this.opinion,
           type = this.type,
@@ -7356,30 +7670,40 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
           isSubFlow = this.isSubFlow,
           pendingId = this.pendingId;
 
+      if (isOpinionRequired == 1 && !opinion && isImageOpinion == 0 || isOpinionRequired == 1 && isImageOpinion == 1 && !file) {
+        return this.$toast('当前步骤必须输入意见!');
+      }
       if (type == 'takeAdvice' && (nextCurrentOrgObj == '' || nextCurrentOrgObj == null && isHideCurrentOrg == 0) || isHideOtherOrg == 0 && nextOtherOrgObj == '' || nextOtherOrgObj == null) {
         return this.$toast('请选择处理对象!');
       } else if (isHideCurrentOrg == 0 && (nextOtherOrgObj == '' || nextOtherOrgObj == null)) {
         return this.$toast('请选择处理对象!');
       }
-
-      if (isOpinionRequired == 1 && (opinion == '' || opinion == null)) {
-        return this.$toast('当前步骤必须输入意见!');
+      var info = {
+        opinion: opinion,
+        pendingId: pendingId,
+        nextOtherOrgObj: Array.isArray(nextOtherOrgObj) ? nextOtherOrgObj.join(',') : nextOtherOrgObj,
+        nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj) ? nextCurrentOrgObj.join(',') : nextCurrentOrgObj,
+        notificationMsg: noticeInfo,
+        notificationType: noticeType.join(','),
+        choiceDeptId: choiceDeptId,
+        isSubFlow: isSubFlow,
+        choiceOrgId: choiceOrgId
+      };
+      var formData = new FormData();
+      if (isImageOpinion == 1) {
+        formData.append('file', file);
+      }
+      formData.append('pendingId', pendingId);
+      for (var key in info) {
+        if (info[key] !== '' && info[key] !== undefined) {
+          formData.append(key, info[key]);
+        }
       }
       // if (this.type != 'startDraf' && this.type != 'unionSeal' && this.type != 'twoOfficesDispatch')
       //   return this.$toast('暂未开放，敬请期待！');
       var param = {
         url: this.type === 'startDraf' ? api["o" /* taskStartDraft */] : this.type == 'unionSeal' ? api["r" /* taskUnionSeal */] : this.type === 'twoOfficesDispatch' ? twoOfficesDispatch : this.type == 'takeAdvice' ? api["p" /* taskTakeAdvice */] : api["q" /* taskUnionExamine */],
-        params: {
-          opinion: opinion,
-          pendingId: pendingId,
-          nextOtherOrgObj: Array.isArray(nextOtherOrgObj) ? nextOtherOrgObj.join(',') : nextOtherOrgObj,
-          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj) ? nextCurrentOrgObj.join(',') : nextCurrentOrgObj,
-          notificationMsg: noticeInfo,
-          notificationType: noticeType.join(','),
-          choiceDeptId: choiceDeptId,
-          isSubFlow: isSubFlow,
-          choiceOrgId: choiceOrgId
-        },
+        params: formData,
         headers: { Accept: 'application/json,text/plain' },
         type: 'post'
       };
@@ -7431,7 +7755,6 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
           pendingId: this.pendingId
         }
       }).then(function (res) {
-        console.log(res, 'res');
         //  const {
         //     status,
         //     message,
@@ -7486,8 +7809,8 @@ taskUnionExaminevue_type_template_id_0cefc67d_render._withStripped = true
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   components_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_0cefc67d_render,
-  taskUnionExaminevue_type_template_id_0cefc67d_staticRenderFns,
+  taskUnionExaminevue_type_template_id_70a11c5a_render,
+  taskUnionExaminevue_type_template_id_70a11c5a_staticRenderFns,
   false,
   null,
   null,