eoss-mobiles 0.3.19 → 0.3.21

package/lib/uploader.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 25);
+/******/ 	return __webpack_require__(__webpack_require__.s = 26);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 25:
+/***/ 26:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

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

@@ -79,6 +79,10 @@ export default {
       type: Boolean,
       default: true
     },
+    showCheckType: {
+      type: Boolean,
+      default: true
+    },
     baseUrl: String,
     userId: {
       type: String,
@@ -142,7 +146,7 @@ export default {
           });
         });
         this.form.notificationType = JSON.parse(JSON.stringify(arr));
-        this.showCheck = true
+        this.showCheck = this.showCheckType
         // this.$emit('onInputMsg', this.form);
       }
       
@@ -177,10 +181,10 @@ export default {
                 });
               });
               this.form.notificationType = arr;
-              this.showCheck = true
+              this.showCheck = this.showCheckType
               this.$emit('onInputMsg', this.form);
             }else if(this.onlyShowType){
-              this.showCheck = true
+              this.showCheck = this.showCheckType
             }
           } else {
             this.$toast(message);

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

@@ -1,21 +1,30 @@
 <template>
   <div class="flow-supervise">
-    <em-input v-model="form.pendTitle" label-width="90" label="标题" readonly />
+    <!-- <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 />
+    <em-input v-model="form.pendingUserNames" label-width="90" label="当前办理人" readonly /> -->
     <Message
       ref="message"
       :code="'notification_type'"
       :baseUrl="baseUrl"
+      :showCheckType="false"
       :showMsg="true"
+      label=""
       :defaultNotificationType="form.noticeType"
       :defaultNotificationMsg="form.notifyMessage"
       onlyShowType
       @onInputMsg="onInputMsg"
     ></Message>
+    <em-flow-list
+      style="flex: 1; overflow-y: auto"
+      type="4"
+      ref="flowList"
+      businessId="7358f2ba425d49018e13386eb987cd45"
+      :show-btn="false"
+    />
     <div class="btn-list">
       <div class="btn" @click="goBack">取消</div>
-      <div class="btn" @click="onSubmit">确定</div>
+      <div class="btn" @click="onSubmit">发送</div>
     </div>
   </div>
 </template>
@@ -23,16 +32,16 @@
 <script>
 import Message from './Message.vue';
 import {
- toTaskSupervise,
- toTaskSuperviseSub
+  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: { 
+  props: {
     baseUrl: String,
-    businessId:String
+    businessId: String
   },
   data() {
     return {
@@ -45,74 +54,73 @@ export default {
     this.getFlowInfo();
   },
   methods: {
-    
-    onSubmit(){
-        console.log('点击了提交')
-        if(this.form.noticeType.length == 0){
-            this.$toast('请选择通知方式');
-            return
-        }
-        if(!this.form.notificationMsg){
-            this.$toast('请填写通知消息内容');
-            return
-        }
-        let {noticeType,notificationMsg,pendingUserIds} = this.form
-        let params = {
-           url:toTaskSuperviseSub,
-           params:{
-            userId:util.getStorage('userId'),
-            urgeUserIds:pendingUserIds,
-            notificationType:noticeType,notificationMessage:notificationMsg,
-            businessId:this.businessId
-           }
+    onSubmit() {
+      console.log('点击了提交');
+      let selectInfo = this.$refs.flowList.$children[0].selectedData; 
+      if(selectInfo.length == 0) return  this.$toast('请选择需要督办的流程');
+      console.log(selectInfo)
+      return;
+      if (!this.form.notificationMsg) {
+        this.$toast('请填写通知消息内容');
+        return;
+      }
+      let { noticeType, notificationMsg, pendingUserIds } = this.form;
+      let params = {
+        url: toTaskSuperviseSub,
+        params: {
+          userId: util.getStorage('userId'),
+          urgeUserIds: pendingUserIds,
+          notificationType: noticeType,
+          notificationMessage: notificationMsg,
+          businessId: this.businessId
         }
-        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 || '系统错误，请联系管理员！');
+      };
+      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: '加载中...'
-        });
+      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.noticeType = res.results.defaultNotificationType.split(',');
-          }else{
-            this.$toast(res.msg)
-            this.goBack()
-          }
-        });
+        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.noticeType = res.results.defaultNotificationType.split(',');
+        } else {
+          this.$toast(res.msg);
+          this.goBack();
+        }
+      });
     },
-     // 通知消息回调
+    // 通知消息回调
     onInputMsg(obj) {
       this.form.noticeType = obj.notificationType.join(',');
       this.form.notificationMsg = obj.notificationMsg;
-    },
-  },
+    }
+  }
 };
 </script>

package/packages/flow-list/src/main.vue

@@ -1,6 +1,10 @@
 <template>
-  <div class="em-flow-list">
-    <div v-if="isgw && processList.length > 0" class="list">
+  <div
+    class="em-flow-list"
+    :style="`background:${type == '3' ? 'unset' : '#fff'}`"
+  >
+    <TaskRead v-if="type == '3' || type == '4'" :businessId="businessId" :type="type" v-bind="$attrs" />
+    <div v-else-if="isgw && processList.length > 0" class="list">
       <div
         v-for="(item, index) in processList"
         :key="index"
@@ -16,7 +20,11 @@
         串行会签预备("串行会签预备", 5),
         自动办理("自动办理", 6); -->
         <i class="iconfont icon-gou" v-if="item.flowList.length > 0" />
-        <div v-else class="process-pending" :style="` background: rgba( ${rgbColor}, 0.1)`">
+        <div
+          v-else
+          class="process-pending"
+          :style="` background: rgba( ${rgbColor}, 0.1)`"
+        >
           <i class="process-pending-yuan" />
         </div>
         <div class="item-box">
@@ -33,20 +41,20 @@
           >
             <div class="two">
               <img
-                style="width:100px;height:100px"
+                style="width: 100px; height: 100px"
                 v-if="x.doresult && x.doresult.startsWith('http')"
                 :src="x.doresult"
                 alt=""
               />
               <span v-else>{{ x.doresult }}</span>
-              <span v-if="x.handleInfo" style="color:#ADADA5">{{
+              <span v-if="x.handleInfo" style="color: #adada5">{{
                 (x.doresult ? '&' : '') + x.handleInfo
               }}</span>
             </div>
             <div class="tree">
-              <div style="display:flex;align-items:center">
+              <div style="display: flex; align-items: center">
                 <span>{{ x.userName }}</span>
-                <span style="margin-left:10px">{{
+                <span style="margin-left: 10px">{{
                   x.createtime | transformTimestamp
                 }}</span>
               </div>
@@ -68,7 +76,7 @@
           <span
             v-if="item.flowList.length > 2"
             class="more"
-            style="display:inline-block;width: 100%;text-align: center;"
+            style="display: inline-block; width: 100%; text-align: center"
             @click="changeMore(index)"
             >{{ item.showMore ? '收起' : '展示更多' }}</span
           >
@@ -94,7 +102,11 @@
           class="iconfont icon-gou"
           v-if="item.pendstate == 2 || item.pendstate == 6"
         />
-        <div v-else class="process-pending" :style="` background: rgba( ${rgbColor}, 0.1)`">
+        <div
+          v-else
+          class="process-pending"
+          :style="` background: rgba( ${rgbColor}, 0.1)`"
+        >
           <i class="process-pending-yuan" />
         </div>
         <div class="item-box">
@@ -105,20 +117,20 @@
           </div>
           <div class="two">
             <img
-              style="width:100px;height:100px"
+              style="width: 100px; height: 100px"
               v-if="item.isImageOpinion == 1"
               :src="item.doresult"
               alt=""
             />
             <span v-else>{{ item.doresult }}</span>
-            <span v-if="item.handleInfo" style="color:#ADADA5">{{
+            <span v-if="item.handleInfo" style="color: #adada5">{{
               (item.doresult ? '&' : '') + item.handleInfo
             }}</span>
           </div>
           <div class="tree">
-            <div style="display:flex;align-items:center">
+            <div style="display: flex; align-items: center">
               <span>{{ item.userid }}</span>
-              <span style="margin-left:10px">{{
+              <span style="margin-left: 10px">{{
                 item.createTime | transformTimestamp
               }}</span>
             </div>
@@ -154,6 +166,7 @@
 <script>
 import { pendedhistoryList } from '../../../src/config/api.js';
 import request from '../../../src/utils/http.js';
+import TaskRead from './taskRead.vue';
 import $ from '../../../src/utils/util';
 export default {
   name: 'EmFlowList',
@@ -161,7 +174,7 @@ export default {
     businessId: {
       type: String,
       default: ''
-    }, 
+    },
     type: {
       type: String,
       default: '0'
@@ -175,6 +188,9 @@ export default {
       default: false
     }
   },
+  components: {
+    TaskRead
+  },
   filters: {
     transformTimestamp(val) {
       return $.formatDate(Number(val), 'yyyy-MM-dd');
@@ -183,16 +199,19 @@ export default {
   data() {
     return {
       processList: [],
-      rgbColor:''
+      rgbColor: ''
     };
   },
-  mounted(){
-   let bgColor = document.documentElement.style.getPropertyValue('--theme-primary') || '#12278B'
-   this.rgbColor = $.getRgb(bgColor).join(',')
+  mounted() {
+    let bgColor =
+      document.documentElement.style.getPropertyValue('--theme-primary') ||
+      '#12278B';
+    this.rgbColor = $.getRgb(bgColor).join(',');
   },
   watch: {
     businessId: {
       handler(val) {
+        if (this.type == 3 ||  this.type == 4) return;
         if (val && this.data.length === 0) {
           this.getFlowList(val);
         } else {
@@ -211,12 +230,12 @@ export default {
         type: 'post',
         params: {
           type: this.type,
-          apprecordId
+          apprecordid: apprecordId
         }
-      }).then(res => {
-        const { rCode, msg, results } = res;
-        if (rCode === 0) {
-          this.processList = results;
+      }).then((res) => {
+        const { status, data } = res;
+        if (status == 'success') {
+          this.processList = this.type == '0'? data.wfHistoryList : data.fyHistoryList;
         } else {
           this.$toast(msg);
         }

package/packages/flow-list/src/taskRead.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="process-page">
+    <div class="main">
+      <div v-if="type == 4" class="box">
+        <div class="title">
+          流程列表
+          <div
+            class="check-btn"
+            v-if="handleUserList.length"
+            @click="handleToggel"
+          >
+            <van-checkbox v-model="isSelectAll">全选</van-checkbox>
+          </div>
+        </div>
+        <div v-if="isLoad && !handleUserList.length" class="no-data">
+          暂无数据
+        </div>
+        <div class="list-area">
+          <van-checkbox-group
+            v-model="selectedIds"
+            @change="handleSelectChange"
+          >
+            <van-checkbox
+              v-for="(item, index) in handleUserList"
+              :key="index"
+              :name="item.id"
+              class="list-item"
+            >
+              <p class="name-area">
+                <span class="handle-name-flow">{{ item.userName }}</span>
+                <span class="user-name-flow">{{ item.itemname }}</span>
+                <span :class="`handle-status ${item.pendstate == 1?'success' : ''}`">{{ item.querykeywords }}</span>
+              </p>
+              <p class="time">{{ item.createtime }}</p>
+            </van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div v-if="type == 3" class="box">
+        <div class="title">
+          未处理分阅列表
+          <div
+            class="check-btn"
+            v-if="handleUserList.length"
+            @click="handleToggel"
+          >
+            <van-checkbox v-model="isSelectAll">全选</van-checkbox>
+          </div>
+        </div>
+        <div v-if="isLoad && !handleUserList.length" class="no-data">
+          暂无数据
+        </div>
+        <div class="list-area">
+          <van-checkbox-group
+            v-model="selectedIds"
+            @change="handleSelectChange"
+          >
+            <van-checkbox
+              v-for="(item, index) in handleUserList"
+              :key="index"
+              :name="item.id"
+              class="list-item"
+            >
+              <p class="name-area">
+                <span class="user-name">{{ item.itemname }}</span>
+                <span class="handle-name">{{ item.userName }}</span>
+                <span class="handle-status">{{ item.pendstate }}</span>
+              </p>
+              <p class="time">创建时间：{{ item.createtime }}</p>
+            </van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div v-if="type == 3" class="box" style="margin-top: 12px">
+        <div class="title">已处理分阅列表</div>
+        <div v-if="isLoad && !hadDoUserList.length" class="no-data">
+          暂无数据
+        </div>
+        <div class="list-area list-area2">
+          <div
+            v-for="(item, index) in hadDoUserList"
+            :key="index"
+            class="list-item list-item2"
+          >
+            <p class="name-area">
+              <span class="user-name">{{ item.itemname }}</span>
+              <span class="handle-name">{{ item.userName }}</span>
+              <span class="handle-status success">已办理</span>
+            </p>
+            <p class="time">办理时间：{{ item.doendtime || item.doetime }}</p>
+            <p class="time">代办人：{{ item.doUserName || item.doetime }}</p>
+            <p class="time">意见：{{ item.doresult }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-area" v-if="showBtn">
+      <van-button round class="btn" @click="handleClose">取消</van-button>
+      <van-button type="primary" round class="btn" @click="handleConfirm"
+        >撤销分阅</van-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  taskReadList,
+  cancelTaskRead,
+  pendedhistoryList
+} from '../../../src/config/api.js';
+import request from '../../../src/utils/http.js';
+export default {
+  props: {
+    businessId: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: String,
+      default: '3'
+    },
+    showBtn:{
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      isLoad: false,
+      hadDoUserList: [],
+      handleUserList: [],
+      isSelectAll: false,
+      selectedIds: [],
+      selectedData: [],
+    };
+  },
+  mounted() {
+    if (this.type == 3) {
+      this.getReadData(1);
+      this.getReadData(2);
+    } else if (this.type == 4) {
+      this.getpendedhistoryList();
+    }
+  },
+  methods: {
+    getpendedhistoryList() {
+      request({
+        url: pendedhistoryList,
+        type: 'post',
+        params: {
+          type: 0,
+          apprecordid: this.businessId
+        }
+      }).then((res) => {
+        const { status, data } = res;
+        if (status == 'success') {
+          this.handleUserList = data.wfHistoryList.filter(x => x.pendstate == 0 || x.pendstate == 1);
+        } else {
+          this.$toast(msg);
+        }
+      });
+    },
+    getReadData(status) {
+      request({
+        url: taskReadList,
+        params: {
+          appRecordId: this.businessId,
+          status
+        }
+      }).then((res) => {
+        this.isLoad = true;
+        if (status == 1) {
+          this.handleUserList = res.data || [];
+        } else {
+          this.hadDoUserList = res.data || [];
+        }
+      });
+    },
+    handleConfirm() {
+      if (!this.selectedIds.length) {
+        this.$toast('请选择需要撤销的分阅数据!');
+        return;
+      }
+      this.$toast.loading({
+        message: '提交中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
+      request({
+        url: cancelTaskRead,
+        params: {
+          appRecordId: this.businessId,
+          pendingIds: this.selectedIds.join(',')
+        }
+      }).then((res) => {
+        this.$toast.clear();
+        if (res.rCode == 0) {
+          this.$toast('操作成功');
+          this.selectedIds = [];
+          this.selectedData = []
+          this.getReadData(1);
+          this.getReadData(2);
+        } else {
+          this.$toast(res.msg);
+        }
+      });
+    },
+    handleClose() {
+      this.$parent.$emit('close');
+    },
+    handleSelectChange(val) {
+      console.log(val,'点击了')
+      this.selectedData = this.handleUserList.filter(x => val.includes(x.id))
+      if (this.selectedIds.length === this.handleUserList.length) {
+        this.isSelectAll = true;
+      } else {
+        this.isSelectAll = false;
+      }
+    },
+    handleToggel() {
+      if (!this.isSelectAll) {
+        this.selectedIds = this.handleUserList.map((i) => i.id);
+        this.selectedData = this.handleUserList
+      } else {
+        this.selectedIds = [];
+        this.selectedData = [];
+      }
+    }
+  }
+};
+</script>