eoss-mobiles 0.2.4 → 0.2.6

package/packages/flow/src/components/Handle.vue

@@ -16,6 +16,7 @@
         <Opinion
           :code="processObj.attachedCode"
           :ownId="pendingId"
+          :esign="esign"
           @onInputOpintion="onInputOpintion"
           :isOpinionRequired="isOpinionRequired"
           :disabled="isBanInputOpinion != 0"
@@ -435,6 +436,10 @@ export default {
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -457,6 +462,7 @@ export default {
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
         opinion: undefined, // 审批意见
+        isImageOpinion: 0,
         isAddSign: undefined, //是否加签
         addSignUserId: undefined, //加签人员id
         isRemoveSign: undefined, //是否减签
@@ -563,6 +569,7 @@ export default {
       choiceDeptId: '',
       taskExamineInfo: {},
       nodeInfoMapInfo: {},
+      file: '',
       isEndUserTask: '',
       pOrgId: ''
     };
@@ -673,7 +680,7 @@ export default {
         duration: 0
       });
       request({
-        url:this.baseUrl ? this.baseUrl + taskReadHtml : taskReadHtml,
+        url: this.baseUrl ? this.baseUrl + taskReadHtml : taskReadHtml,
         headers: {
           Accept: 'application/json,text/plain'
         },
@@ -709,6 +716,19 @@ export default {
           (i === this.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 &&
@@ -730,14 +750,7 @@ export default {
         this.$toast('请选择流程节点');
         return;
       }
-      if (
-        !this.form.opinion &&
-        this.isOpinionRequired == 1 &&
-        !this.nodeDefaultSubmitOpinion
-      ) {
-        this.$toast('请选择输入审批意见');
-        return;
-      }
+
       let str = '';
       if (this.form.opinion) {
         str = this.form.opinion.replace(/\s+/g, '');
@@ -817,13 +830,20 @@ export default {
         _that.form.nextOperate == 0 || _that.form.nextOperate == 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
           : '';
+      let formData = new FormData();
+      if (_that.form.isImageOpinion == 1) {
+        formData.append('file', _that.file);
+      }
+      formData.append('pendingId', _that.pendingId);
+      for (let key in _that.form) {
+        if (_that.form[key] !== '' && _that.form[key] !== undefined) {
+          formData.append(key, _that.form[key]);
+        }
+      }
       request({
         url: _that.baseUrl ? _that.baseUrl + taskHandleHtml : taskHandleHtml,
         type: 'post',
-        params: {
-          pendingId: _that.pendingId,
-          ..._that.form
-        }
+        params: formData
       }).then(res => {
         this.$toast.clear();
         if (res.status == 'success') {
@@ -962,7 +982,10 @@ export default {
     },
     // 意见回调
     onInputOpintion(val) {
-      this.form.opinion = val;
+      const { opinion, isImageOpinion, file } = val;
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
     // 办理人选择完回调
     disposeAppUser(res, type) {
@@ -1247,7 +1270,9 @@ export default {
     },
     getToStartTaskReadIndex() {
       request({
-        url:this.baseUrl ? this.baseUrl + toStartTaskReadHtml : toStartTaskReadHtml,
+        url: this.baseUrl
+          ? this.baseUrl + toStartTaskReadHtml
+          : toStartTaskReadHtml,
         params: { pendingId: this.pendingId }
       })
         .then(res => {

package/packages/flow/src/components/Opinion.vue

@@ -1,28 +1,75 @@
 <template>
   <div class="opinton-content">
     <div class="input-box" :type="isFile ? 'haveFile' : 'noHaveFile'">
-      <div class="item">
-        <em-input
-          :label="label"
-          :placeholder="placeholder"
-          v-model="opinion"
-          type="textarea"
-          rows="3"
-          @input="onInput"
-          :disabled="disabled || fixedDisabled"
-          :required="isOpinionRequired == 1 ? true : false"
-        />
+      <div v-if="esign">
+        <em-tabs v-model="isImageOpinion" @change="handleChange">
+          <em-tab
+            :title="item.text"
+            v-for="item in tabs"
+            :key="item.id"
+            :name="item.type"
+          >
+            <em-esign
+              style="padding:0px 10px"
+              v-show="isImageOpinion === 1"
+              @save="handleSave"
+              :file-path="esignPath"
+            />
+            <div
+              v-show="isImageOpinion === 0"
+              class="item em-flow-opion-box"
+              style="padding-bottom:20px"
+            >
+              <em-input
+                :label="label"
+                :placeholder="placeholder"
+                v-model="opinion"
+                type="textarea"
+                rows="3"
+                @input="onInput"
+                :disabled="disabled || fixedDisabled"
+                :required="isOpinionRequired == 1 ? true : false"
+              />
+              <span
+                class="em-flow-opion"
+                v-if="opinionList.length > 0 && isHiddenOftenOpinion"
+                @click="showPicker = true"
+                >常见意见 <i class="iconfont icon-youjiantou"
+              /></span>
+            </div>
+          </em-tab>
+        </em-tabs>
       </div>
-      <div class="item" v-if="opinionList.length > 0 && isHiddenOftenOpinion">
-        <em-input
-          label-width="100%"
-          readonly
-          v-model="selectOpinion"
-          placeholder="请选择常用语"
-          label="请选择常用语"
-          @click="showPicker = true"
-        >
-        </em-input>
+      <div v-else>
+        <div class="item em-flow-opion-box" style="padding-bottom:20px">
+          <em-input
+            :label="label"
+            :placeholder="placeholder"
+            v-model="opinion"
+            type="textarea"
+            rows="3"
+            @input="onInput"
+            :disabled="disabled || fixedDisabled"
+            :required="isOpinionRequired == 1 ? true : false"
+          />
+          <span
+            class="em-flow-opion"
+            v-if="opinionList.length > 0 && isHiddenOftenOpinion"
+            @click="showPicker = true"
+            >常见意见 <i class="iconfont icon-youjiantou"
+          /></span>
+        </div>
+        <!-- <div class="item" v-if="opinionList.length > 0 && isHiddenOftenOpinion">
+          <em-input
+            label-width="100%"
+            readonly
+            v-model="selectOpinion"
+            placeholder="请选择常用语"
+            label="请选择常用语"
+            @click="showPicker = true"
+          >
+          </em-input>
+        </div> -->
       </div>
     </div>
     <div class="input-box input-box-file" v-if="isFile">
@@ -84,6 +131,10 @@ export default {
     nodeFixedOpinionSelectList: {
       type: Array,
       default: () => []
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   // components: {
@@ -92,9 +143,15 @@ export default {
   data() {
     return {
       opinion: '',
-      selectOpinion: '',
       fixedDisabled: false,
       showPicker: false,
+      esignPath: '',
+      tabs: [
+        { id: 0, text: '键盘签批', type: 0 },
+        { id: 1, text: '手写签批', type: 1 }
+      ],
+      isImageOpinion: 0,
+      file: '',
       opinionList: [] //意见列表
     };
   },
@@ -107,6 +164,24 @@ export default {
     }
   },
   methods: {
+    handleSave(info) {
+      const { isImageOpinion } = this;
+      this.esignPath = info.data;
+      this.file = info.file;
+      this.$emit('onInputOpintion', {
+        opinion: this.opinion,
+        isImageOpinion,
+        file:info.file
+      });
+    },
+    handleChange() {
+      const { isImageOpinion, file } = this;
+      this.$emit('onInputOpintion', {
+        opinion: this.opinion,
+        isImageOpinion,
+        file
+      });
+    },
     handleClose() {
       this.showPicker = false;
     },
@@ -124,16 +199,13 @@ export default {
     },
     // 将input的值传递到父组件
     onInput(val) {
+      const { isImageOpinion, file } = this;
       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,
+        file
+      });
       this.showPicker = false;
     }
   }

package/packages/flow/src/components/Reject.vue

@@ -8,6 +8,7 @@
       <Opinion
         :code="processObj.attachedCode"
         :ownId="$route.query.pendingId"
+        :esign="esign"
         @onInputOpintion="onInputOpintion"
         :isOpinionRequired="isBanInputOpinion"
         :disabled="isBanInputOpinion != 0"
@@ -52,7 +53,11 @@ export default {
     pendingId: String,
     userId: String,
     beforeSubmit: Function,
-    baseUrl: String
+    baseUrl: String,
+     esign: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
@@ -62,8 +67,10 @@ export default {
         opinion: undefined, // 审批意见
         notificationMsg: undefined, //系统消息
         nextNodeId: undefined,
-        loginType: 2 //登录方式
+        loginType: 2, //登录方式
+        isImageOpinion:0,
       },
+      file:'',
       processObj: {
         taskExamine: { nodeName: undefined },
         nodeInfoMap: { nextUserList: [] }
@@ -93,7 +100,10 @@ export default {
     },
     // 意见回调
     onInputOpintion(val) {
-      this.form.opinion = val;
+      const { opinion, isImageOpinion, file } = val;
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
     goBack() {
       this.$parent.$emit('close');
@@ -101,8 +111,8 @@ export default {
     },
     // 提交流程
     onSubmit() {
-      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;
       }
       let str = '';
@@ -116,6 +126,16 @@ export default {
         this.beforeSubmit({ pendingId: this.pendingId, ...this.form });
         return;
       }
+      let formData = new FormData();
+      if (this.form.isImageOpinion == 1) {
+        formData.append('file', this.file);
+      }
+      formData.append('pendingId', this.pendingId);
+      for (let key in this.form) {
+        if (this.form[key] !== '' && this.form[key] !== undefined) {
+          formData.append(key, this.form[key]);
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -127,11 +147,7 @@ export default {
       request({
         url: _that.baseUrl ? _that.baseUrl + taskRejectHtml : taskRejectHtml,
         type: 'post',
-        params: {
-          pendingId: _that.pendingId,
-          // nextNodeId: this.dataJson.taskExamine.nodeId,
-          ...this.form
-        }
+        params: formData
       }).then(res => {
         if (res.status == 'success') {
           this.$toast('操作成功');

package/packages/flow/src/components/StartFlow.vue

@@ -12,6 +12,7 @@
         v-if="showOpinion"
         :code="processObj.attachedCode"
         :ownId="businessId"
+        :esign="esign"
         :isFile="false"
         :baseUrl="baseUrl"
         @onInputOpintion="onInputOpintion"
@@ -133,6 +134,10 @@ export default {
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -147,8 +152,10 @@ export default {
         opinion: undefined, // 审批意见
         nodeId: undefined,
         notificationMsg: undefined, //系统消息
-        notificationType: []
+        notificationType: [],
+        isImageOpinion: 0
       },
+      file: '',
       nextUserList: [],
       isChooseNextNode: 0,
       isOpinionRequired: 0, //办理意见是否必填
@@ -178,6 +185,8 @@ export default {
   mounted() {
     let obj = {
       processDefinitionId: this.defId,
+      // isOnly: true,
+      // hideTempSave: true,
       businessId: this.businessId
     };
     this.geAllData(obj);
@@ -225,10 +234,24 @@ export default {
     },
     // 意见回调
     onInputOpintion(val) {
-      this.form.opinion = val;
+      const { opinion, isImageOpinion, file } = val;
+      this.form.opinion = opinion;
+      this.form.isImageOpinion = isImageOpinion;
+      this.file = file;
     },
     // 提交流程
     onSubmit() {
+      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;
@@ -237,10 +260,6 @@ export default {
         this.$toast('请选择流程节点');
         return;
       }
-      if (!this.form.opinion && this.isOpinionRequired == 1) {
-        this.$toast('请选择输入审批意见');
-        return;
-      }
       // if (!this.form.notificationType) {
       //   this.$toast('请选择通知消息');
       //   return;
@@ -258,12 +277,23 @@ export default {
         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;
       }
+      let formData = new FormData();
+      if (this.form.isImageOpinion == 1) {
+        formData.append('file', this.file);
+      }
+      formData.append('pendingId', this.pendingId);
+      for (let key in info) {
+        if (info[key] !== '' && info[key] !== undefined) {
+          formData.append(key, info[key]);
+        }
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -275,9 +305,7 @@ export default {
       request({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + registerNew : registerNew,
         type: 'post',
-        params: {
-          ...info
-        }
+        params: formData
       }).then(res => {
         this.$toast.clear();
         if (res.rCode == 0) {

package/packages/flow/src/components/taskUnionExamine.vue

@@ -6,7 +6,8 @@
         <div>{{ nodeName }}</div>
       </div>
       <Opinion
-        @onInputOpintion="val => (opinion = val)"
+        @onInputOpintion="onInputOpintion"
+          :esign="esign"
         :baseUrl="baseUrl"
       ></Opinion>
       <div class="input-box">
@@ -117,11 +118,17 @@ export default {
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    esign: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       opinion: '', //办理意见
+      isImageOpinion:0,
+      file:'',
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -184,6 +191,12 @@ export default {
     }
   },
   methods: {
+     onInputOpintion(val) {
+      const { opinion, isImageOpinion, file } = val;
+      this.opinion = opinion;
+      this.isImageOpinion = isImageOpinion;
+      this.file = file;
+    },
     getIsCanStartSubFlow() {
       let params = {
         url: isCanStartSubFlow,
@@ -401,6 +414,8 @@ export default {
           noticeType,
           noticeInfo
         },
+        isImageOpinion,
+        file,
         isOpinionRequired,
         opinion,
         type,
@@ -411,6 +426,9 @@ export default {
         isSubFlow,
         pendingId
       } = this;
+       if ((isOpinionRequired == 1 && !opinion && isImageOpinion == 0) || (isOpinionRequired == 1 && isImageOpinion == 1 && !file) ) {
+        return this.$toast('当前步骤必须输入意见!');
+      }
       if (
         (type == 'takeAdvice' &&
           (nextCurrentOrgObj == '' ||
@@ -425,9 +443,30 @@ export default {
       ) {
         return this.$toast('请选择处理对象!');
       }
-
-      if (isOpinionRequired == 1 && (opinion == '' || opinion == null)) {
-        return this.$toast('当前步骤必须输入意见!');
+      let info = {
+          opinion,
+          pendingId,
+          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
+            ? nextOtherOrgObj.join(',')
+            : nextOtherOrgObj,
+          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
+            ? nextCurrentOrgObj.join(',')
+            : nextCurrentOrgObj,
+          notificationMsg: noticeInfo,
+          notificationType: noticeType.join(','),
+          choiceDeptId,
+          isSubFlow,
+          choiceOrgId
+        }
+        let formData = new FormData();
+      if (isImageOpinion == 1) {
+        formData.append('file', file);
+      }
+      formData.append('pendingId', pendingId);
+      for (let 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('暂未开放，敬请期待！');
@@ -442,21 +481,7 @@ export default {
             : this.type == 'takeAdvice'
             ? taskTakeAdvice
             : taskUnionExamine,
-        params: {
-          opinion,
-          pendingId,
-          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
-            ? nextOtherOrgObj.join(',')
-            : nextOtherOrgObj,
-          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
-            ? nextCurrentOrgObj.join(',')
-            : nextCurrentOrgObj,
-          notificationMsg: noticeInfo,
-          notificationType: noticeType.join(','),
-          choiceDeptId,
-          isSubFlow,
-          choiceOrgId
-        },
+        params: formData,
         headers: { Accept: 'application/json,text/plain' },
         type: 'post'
       };
@@ -508,7 +533,6 @@ export default {
           pendingId: this.pendingId
         }
       }).then(res => {
-        console.log(res, 'res');
         //  const {
         //     status,
         //     message,

package/packages/selector/src/main.vue

@@ -9,7 +9,7 @@
     />
     <slot v-else name="input" :click="handleSelector" />
     <em-selector-tree
-      v-if="showSelectorTree || showTree"
+      v-if="(showSelectorTree || showTree) && (typeof value !== 'string')"
       v-bind="$attrs"
       v-on="$listeners"
       :showTree="showTree"
@@ -22,6 +22,22 @@
       <slot  v-if="$scopedSlots['tree-icon']" name="tree-icon" :value="value"></slot>
     </template>
     </em-selector-tree>
+    <div v-if="typeof value === 'string'">
+      <em-selector-tree
+      v-show="showSelectorTree || showTree"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :showTree="showTree"
+      :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
+      :selectList.sync="selectList"
+      @dispose="handleDispose"
+      @close="handleDispose()"
+    >
+    <template v-if="$scopedSlots['tree-icon']" slot="tree-icon" slot-scope="{value}">
+      <slot  v-if="$scopedSlots['tree-icon']" name="tree-icon" :value="value"></slot>
+    </template>
+    </em-selector-tree>
+    </div>
   </div>
 </template>
 
@@ -33,17 +49,27 @@ export default {
   name: 'EmSelector',
   inheritAttrs: false,
   props: {
-    value: { type: Array, default: () => [] },
+    value: { type: [Array,String], default: () => [] },
     showTree: {
       type: Boolean,
       default: false
-    }
+    },
   },
   data() {
     return {
-      showSelectorTree: false
+      showSelectorTree: false,
+      // newSelectList:[]
     };
   },
+  watch:{
+    value:{
+      handler(val){
+        this.selectList = val;
+      },
+      deep:true,
+      immediate:true
+    }
+  },
   computed: {
     selectList: {
       get() {
@@ -55,6 +81,7 @@ export default {
     }
   },
   mounted() {
+    // this.selectList = this.value
   },
   methods: {
     handleSelector() {