eoss-mobiles 0.3.97 → 0.3.99

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

@@ -99,6 +99,19 @@
             type="textarea"
             rows="3"
           />
+        </div>
+         <div class="item" v-if="withSubmitCurrentTaskReadEnabled">
+          <em-input class="read-type" label="同步提交" readonly>
+            <template slot="input">
+              <div class="template-input-two" style="width: 100%">
+                <em-radio-group
+                  v-model="isWith"
+                  :data="withRadioData"
+                  direction="horizontal"
+                />
+              </div>
+            </template>
+          </em-input>
         </div>
         <div class="item">
           <Message
@@ -140,15 +153,23 @@ import {
 import util from '../../../../src/utils/util.js';
 import Opinion from './Opinion.vue';
 import request from '../../../../src/utils/http.js';
+import $ from '../../../../src/utils/util';
 export default {
   data() {
     return {
+      withSubmitCurrentTaskReadEnabled:false,
+      taskReadOpinionRequired:false,
       nextNode: {},
       isSync: '0',
       radioData: [
         { name: '普通分阅', value: '0' },
         { name: '同步办理', value: '1' }
       ],
+      isWith: '0',
+      withRadioData: [
+        { name: '提交', value: '0' },
+        { name: '不提交', value: '1' }
+      ],
       isSyncCopy: false,
       readOnlyNotificationType: '',
       defaultNotificationMessage: '',
@@ -178,6 +199,10 @@ export default {
     Opinion
   },
   props: {
+    opinionType: {
+      type: String,
+      default: 'picker'
+    },
     appid: String,
     orgId: String,
     beforeSubmit: Function,
@@ -186,6 +211,10 @@ export default {
     baseUrl: String,
     apiBaseUrl: String,
     type: String,
+    taskAction:{
+      type: String,
+      default: ''
+    },
     readParams: {
       type: Object,
       default: undefined
@@ -267,6 +296,66 @@ export default {
   },
 
   methods: {
+     subRead() {
+      const { businessId, appId, processDefinitionId, pendingId } =
+        this.taskExamine;
+      if (this.taskReadOpinionRequired == 'true' && !this.form.handleExplain)
+        return this.$toast('分阅阅结必须输入意见!');
+      let params = {
+        businessId,
+        appId,
+        processDefinitionId,
+        pendingId,
+        opinion: this.form.handleExplain,
+        taskAction: 'complete',
+        mobileKey: $.getStorage('deviceId') || '123',
+        userId: this.userId || $.getStorage('userId')
+      };
+      let formData = new FormData();
+     
+      for (let key in params) {
+        if (params[key] !== '' && params[key] !== undefined) {
+          formData.append(key, params[key]);
+        }
+      }
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: this.baseUrl
+          ? this.baseUrl + taskReadHtml
+          : taskReadHtml,
+        headers: {
+          Accept: 'application/json,text/plain'
+        },
+        type: 'post',
+        params: formData,
+        format: false
+      })
+        .then((res) => {
+          const { status, message } = res;
+          this.$toast.clear();
+          if (status === 'success') {
+            this.$toast.success('提交成功');
+            this.$parent.$emit('success','submit');
+          } else {
+            this.$toast(message || '系统错误，请联系管理员！');
+            setTimeout(() => {
+              this.$parent.$emit('error');
+            }, 1000);
+          }
+        })
+        .catch((err) => {
+          this.loading.close();
+          if (err.message && err.message !== 'canceled') {
+            this.$toast(err.message);
+          }
+        });
+    },
     handlePop(val) {
       this.$parent.$emit('opinion-change', val);
     },
@@ -511,7 +600,7 @@ export default {
       let params = {
         appId: this.processObj.taskExamine.appId,
         businessId: this.processObj.taskExamine.businessId,
-        // taskAction: this.newType,
+        taskAction: this.taskAction,
         userId: this.userId,
         mobileKey: util.getStorage('deviceId') || '123'
       };
@@ -523,6 +612,7 @@ export default {
       }).then((res) => {
         if (res.status == 'success' || res.rCode == 0) {
           this.selectPersonValue = res.data.selectPersonValue;
+          this.withSubmitCurrentTaskReadEnabled = res.data.withSubmitCurrentTaskReadEnabled;
           this.isSyncCopy = res.data.isSyncCopy == 1;
           if (res.data.taskHandleReadUserSelectLabelName) {
             this.radioData[1].name = res.data.taskHandleReadUserSelectLabelName;
@@ -533,13 +623,14 @@ export default {
     },
     getProcessObjNew() {
       const _that = this;
+      console.log('pendingId', this.taskAction);
       let params = {
         pendingId: this.pendingId,
         taskAction: _that.newType,
         userId: _that.userId,
         mobileKey: util.getStorage('deviceId') || '123'
       };
-      if (_that.newType != 'taskReadAndEnd') delete params.taskAction;
+      if (_that.newType != 'taskReadAndEnd' ) delete params.taskAction;
 
       request({
         url: _that.baseUrl
@@ -552,7 +643,7 @@ export default {
           this.processObj = res.data;
           // this.notificationMsgType = res.data.defaultNotificationType.split(',');
           // this.isMultiple()
-
+          this.taskReadOpinionRequired = res.data.taskReadOpinionRequired == 'true';
           this.getTaskRead();
           this.taskExamine = res.data.taskExamine;
           // console.log(this.taskExamine, 'taskExaminetaskExaminetaskExamine');
@@ -740,6 +831,7 @@ export default {
         this.beforeSubmit(params.params);
         return;
       }
+          
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -751,7 +843,11 @@ export default {
         .then((res) => {
           if (res.status == 'success') {
             this.$toast('操作成功');
-            this.$parent.$emit('success');
+            if(this.isWith == '0' && this.withSubmitCurrentTaskReadEnabled){
+              this.subRead()
+            }else{
+              this.$parent.$emit('success');
+            }
           } else {
             this.$toast(res.message);
           }

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

@@ -1,139 +1,139 @@
-<template>
-  <div class="flow-supervise">
-    <!-- <em-input v-model="form.pendTitle" label-width="90" label="标题" readonly />
-    <em-input v-model="form.currentHandleNode" label-width="90" label="当前办理节点" readonly />
-    <em-input v-model="form.pendingUserNames" label-width="90" label="当前办理人" readonly /> -->
-    <Message
-    v-if="!hideMessage"
-      ref="message"
-      :code="msgCode"
-      :baseUrl="baseUrl"
-      :showCheckType="false"
-      :showMsg="true"
-      label=""
-      :defaultNotificationType="form.noticeType"
-      :defaultNotificationMsg="form.notifyMessage"
-      onlyShowType
-      @onInputMsg="onInputMsg"
-    ></Message>
-    <em-flow-list
-    v-if="showFlowList"
-      style="flex: 1; overflow-y: auto"
-      type="4"
-      :data="flowList"
-      ref="flowList"
-      businessId="7358f2ba425d49018e13386eb987cd45"
-      :show-btn="false"
-    />
-    <div class="btn-list">
-      <div class="btn" @click="goBack">取消</div>
-      <div class="btn" @click="onSubmit">发送</div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Message from './Message.vue';
-import {
-  toTaskSupervise,
-  toTaskSuperviseSub
-} from '../../../../src/config/api';
-import request from '../../../../src/utils/http.js';
-import util from '../../../../src/utils/util.js';
-export default {
-  components: { Message },
-  props: {
-    baseUrl: String,
-    businessId: String,
-    msgCode: {
-      type: String,
-      default: 'notification_type'
-    },
-    appId:{type:String,default:''},
-    hideMessage:{type:Boolean,default:false}
-  },
-  data() {
-    return {
-      form: {
-        title: '',
-      },
-      flowList:[],
-      showFlowList:false,
-    };
-  },
-  mounted() {
-    this.getFlowInfo();
-  },
-  methods: {
-    onSubmit() {
-      let selectInfo = this.$refs.flowList.$children[0].selectedData; 
-      if(selectInfo.length == 0) return  this.$toast('请选择需要督办的流程');
-      
-      let { noticeType, notificationMsg, pendingUserIds } = this.form;
-      let params = {
-        url: toTaskSuperviseSub,
-        params: {
-          userId: util.getStorage('userId'),
-          urgeUserIds: selectInfo.map(item=>item.userid).join(','),
-          notificationType: Array.isArray(noticeType) ? noticeType.join(',') : noticeType,
-          notificationMessage: notificationMsg,
-          businessId: this.businessId,
-          appId:this.appId
-        }
-      };
-   
-      this.$toast.loading({
-        duration: 0,
-        forbidClick: true,
-        message: '提交中...'
-      });
-      request(params).then((res) => {
-        this.$toast.clear();
-        if (res.rCode == 0 || res.status == 'success') {
-          this.$toast('发送成功');
-          this.$parent.$emit('success');
-        } else {
-          this.$message.error(res.message || '系统错误，请联系管理员！');
-        }
-      });
-    },
-    goBack() {
-      this.$parent.$emit('close');
-    },
-    getFlowInfo() {
-      this.$toast.loading({
-        duration: 0,
-        forbidClick: true,
-        message: '加载中...'
-      });
-      request({
-        url: toTaskSupervise,
-        params: {
-          businessId: this.businessId,
-          userId: util.getStorage('userId')
-        }
-      }).then((res) => {
-        this.$toast.clear();
-        if (res.rCode == 0) {
-          this.form = res.results;
-          this.form.notificationMsg = res.results.notifyMessage
-          this.flowList = res.results.taskSuperviseHistories;
-          if(!this.hideMessage){
-            this.form.noticeType = res.results.fixedNotificationType.split(',');
-          }
-          
-          this.showFlowList = true;
-        } else {
-          this.$toast(res.msg);
-          this.goBack();
-        }
-      });
-    },
-    // 通知消息回调
-    onInputMsg(obj) {
-      this.form.noticeType = obj.notificationType.join(',');
-      this.form.notificationMsg = obj.notificationMsg;
-    }
-  }
-};
-</script>
+<template>
+  <div class="flow-supervise">
+    <!-- <em-input v-model="form.pendTitle" label-width="90" label="标题" readonly />
+    <em-input v-model="form.currentHandleNode" label-width="90" label="当前办理节点" readonly />
+    <em-input v-model="form.pendingUserNames" label-width="90" label="当前办理人" readonly /> -->
+    <Message
+    v-if="!hideMessage"
+      ref="message"
+      :code="msgCode"
+      :baseUrl="baseUrl"
+      :showCheckType="false"
+      :showMsg="true"
+      label=""
+      :defaultNotificationType="form.noticeType"
+      :defaultNotificationMsg="form.notifyMessage"
+      onlyShowType
+      @onInputMsg="onInputMsg"
+    ></Message>
+    <em-flow-list
+    v-if="showFlowList"
+      style="flex: 1; overflow-y: auto"
+      type="4"
+      :data="flowList"
+      ref="flowList"
+      businessId="7358f2ba425d49018e13386eb987cd45"
+      :show-btn="false"
+    />
+    <div class="btn-list">
+      <div class="btn" @click="goBack">取消</div>
+      <div class="btn" @click="onSubmit">发送</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Message from './Message.vue';
+import {
+  toTaskSupervise,
+  toTaskSuperviseSub
+} from '../../../../src/config/api';
+import request from '../../../../src/utils/http.js';
+import util from '../../../../src/utils/util.js';
+export default {
+  components: { Message },
+  props: {
+    baseUrl: String,
+    businessId: String,
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
+    appId:{type:String,default:''},
+    hideMessage:{type:Boolean,default:false}
+  },
+  data() {
+    return {
+      form: {
+        title: '',
+      },
+      flowList:[],
+      showFlowList:false,
+    };
+  },
+  mounted() {
+    this.getFlowInfo();
+  },
+  methods: {
+    onSubmit() {
+      let selectInfo = this.$refs.flowList.$children[0].selectedData; 
+      if(selectInfo.length == 0) return  this.$toast('请选择需要督办的流程');
+      
+      let { noticeType, notificationMsg, pendingUserIds } = this.form;
+      let params = {
+        url: toTaskSuperviseSub,
+        params: {
+          userId: util.getStorage('userId'),
+          urgeUserIds: selectInfo.map(item=>item.userid).join(','),
+          notificationType: Array.isArray(noticeType) ? noticeType.join(',') : noticeType,
+          notificationMessage: notificationMsg,
+          businessId: this.businessId,
+          appId:this.appId
+        }
+      };
+   
+      this.$toast.loading({
+        duration: 0,
+        forbidClick: true,
+        message: '提交中...'
+      });
+      request(params).then((res) => {
+        this.$toast.clear();
+        if (res.rCode == 0 || res.status == 'success') {
+          this.$toast('发送成功');
+          this.$parent.$emit('success');
+        } else {
+          this.$message.error(res.message || '系统错误，请联系管理员！');
+        }
+      });
+    },
+    goBack() {
+      this.$parent.$emit('close');
+    },
+    getFlowInfo() {
+      this.$toast.loading({
+        duration: 0,
+        forbidClick: true,
+        message: '加载中...'
+      });
+      request({
+        url: toTaskSupervise,
+        params: {
+          businessId: this.businessId,
+          userId: util.getStorage('userId')
+        }
+      }).then((res) => {
+        this.$toast.clear();
+        if (res.rCode == 0) {
+          this.form = res.results;
+          this.form.notificationMsg = res.results.notifyMessage
+          this.flowList = res.results.taskSuperviseHistories;
+          if(!this.hideMessage){
+            this.form.noticeType = res.results.fixedNotificationType.split(',');
+          }
+          
+          this.showFlowList = true;
+        } else {
+          this.$toast(res.msg);
+          this.goBack();
+        }
+      });
+    },
+    // 通知消息回调
+    onInputMsg(obj) {
+      this.form.noticeType = obj.notificationType.join(',');
+      this.form.notificationMsg = obj.notificationMsg;
+    }
+  }
+};
+</script>