eoss-ui 0.6.93 → 0.6.95

package/packages/flow/src/component/Circulate.vue

@@ -31,12 +31,14 @@
           :params="otherParams"
         />
       </el-form-item>
+      
+        <!-- :rules="[
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
+        ]" -->
       <el-form-item
         prop="noticeType"
         label="通知方式"
-        :rules="[
-          { required: false, message: `请选择通知方式`, trigger: 'blur' }
-        ]"
+        v-show="infoList.noticeList != 0"
       >
         <el-checkbox-group
           v-model="infoList.noticeType"
@@ -316,7 +318,8 @@ export default {
           params: {
             ccCode: 'notification_type',
             userId: util.getStorage('userId'),
-            pendingId:this.pendingId
+            pendingId:this.pendingId,
+            startCircularRead:true
           }
         })
         .then((res) => {

package/packages/flow/src/component/SendMsg.vue

@@ -9,12 +9,13 @@
       <el-form-item prop="nodeName" label="标题">
         <div>{{ sendInfo.title }}</div>
       </el-form-item>
+      <!-- :rules="[
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
+        ]" -->
       <el-form-item
         prop="notificationType"
         label="通知方式"
-        :rules="[
-          { required: false, message: `请选择通知方式`, trigger: 'blur' }
-        ]"
+        v-show="notificationList.length != 0"
       >
         <el-checkbox-group
           v-model="sendInfo.notificationType"
@@ -34,7 +35,7 @@
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item prop="nextNode" label="通知消息">
+      <el-form-item prop="nextNode" label="通知消息" v-show="notificationList.length != 0">
         <el-input
           type="textarea"
           autosize

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

@@ -79,12 +79,13 @@
           :tabs="foreignOrgTabsParam"
         />
       </el-form-item>
+       <!-- :rules="[
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
+        ]" -->
       <el-form-item
         prop="noticeType"
         label="通知方式"
-        :rules="[
-          { required: false, message: `请选择通知方式`, trigger: 'blur' }
-        ]"
+       v-show="infoList.noticeList.length != 0"
       >
         <el-checkbox-group
           v-model="infoList.noticeType"

package/packages/flow/src/main.vue

@@ -674,10 +674,11 @@
           :showBtn="false"
           :formTitle="formTitle"
           :urgencyLevel="urgencyLevel"
-          :messageType='newsList'
+          :messageType="newsList"
           :copy-history="freeStartFlowParams.pendedHistoryHandle"
           :process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
           :opinion="value"
+          :keyCount="msgTypeCount"
           :pendingId="pendingId"
           :taskExamineParam="freeStartFlowParams.newFlowStartNodeItemName"
           :taskParams="taskParams"
@@ -705,7 +706,7 @@
           :oldOption="value"
           @cancel="closeProcess($event, 'circulateVisible')"
         />
-        <div v-if="!isFlow && isSpecial" style="padding: 5px; background: #fff">
+        <div v-if="!isFlow && isSpecial && newsList.length>0" style="padding: 5px; background: #fff">
           <div class="news" @click="showMessage">
             <span class="news-item">消息通知</span>
             <span :class="showNews ? 'show' : 'sj'"></span>
@@ -1004,7 +1005,7 @@
           :simpleTips="simpleTips"
           :show-reject="showReject"
           :news-info="nextNode.notificationMsg"
-          @cancel="closeProcess(true, 'showReject')"
+          @cancel="closeProcess($event, 'showReject')"
         />
       </es-dialog>
       <es-dialog
@@ -1456,6 +1457,7 @@ export default {
     isCirculate: {
       handler(val) {
         if (!val && this.showCirculate != undefined) {
+        this.showCirculate = val;
           this.getInfo();
         }
         this.showCirculate = val;
@@ -1577,7 +1579,11 @@ export default {
     },
     getInfo() {
       if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
-      this.getNodeType();
+      if(this.showCirculate != undefined && !this.showCirculate && this.urgencyLevel){
+        this.getAdminMsgType()
+      }else{
+        this.getNodeType();
+      }
       !this.isFlow &&
         (this.newTypeCode = this.typeCode || this.$route.query.typecode);
       if (this.isFlow) {
@@ -1951,15 +1957,16 @@ export default {
       }
     },
     getNodeType() {
+      let params = {
+        url: findCodeValues,
+        params: {
+          ccCode: 'notification_type',
+          userId: util.getStorage('userId'),
+          pendingId: this.pendingId,
+        }
+      };
       util
-        .ajax({
-          url: findCodeValues,
-          params: {
-            ccCode: 'notification_type',
-            userId: util.getStorage('userId'),
-            pendingId: this.pendingId
-          }
-        })
+        .ajax(params)
         .then((res) => {
           const { status, data } = res;
           if (status === 'success') {
@@ -3257,6 +3264,9 @@ export default {
               if (this.nodeInfo.nextNode) {
                 this.handleChange(this.nodeInfo.nextNode);
               }
+              if(this.showCirculate != undefined && !this.showCirculate && this.urgencyLevel){
+        this.getAdminMsgType()
+      }
             }
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/flow/src/processForm.vue

@@ -248,7 +248,7 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
-        <el-form-item prop="noticeType" label="通知方式" v-show="showBtn">
+        <el-form-item prop="noticeType" label="通知方式" v-show="showBtn && nextNode.noticeList.length>0">
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox
               v-for="item of nextNode.noticeList"
@@ -327,7 +327,7 @@
         </div>
       </el-form-item>
     </el-form>
-    <div v-if="!showBtn" style="padding: 5px; background: #fff">
+    <div v-if="!showBtn && nextNode.noticeList.length>0" style="padding: 5px; background: #fff">
       <div class="news" @click="showNews = !showNews">
         <span class="news-item">消息通知</span>
         <span :class="showNews ? 'show' : 'sj'"></span>
@@ -451,7 +451,11 @@ export default {
     urgencyLevel:{
       type:[Number,String],
       default:''
-    }
+    },
+    keyCount:{
+      type:[Number,String],
+      default:0
+    },
   },
   data() {
     return {
@@ -550,7 +554,7 @@ export default {
   watch: {
     messageType:{
       handler(val) {
-        if (val.length > 0 && this.urgencyLevel && this.msgTypeCount != 0) {
+        if (this.urgencyLevel) {
           this.nextNode.noticeList = val;
           let arr = [];
           this.nextNode.noticeList.map((item) => {
@@ -604,7 +608,9 @@ export default {
     this.getUserInfo();
   },
   mounted() {
-    this.getNodeType();
+    if(!this.urgencyLevel){
+      this.getNodeType();
+    }
     this.getStartFlow(this.processDefinitionId);
     if (this.copyHistory) {
       this.nextNode.newOpinion = this.opinion;

package/packages/flow/src/processReject.vue

@@ -24,18 +24,20 @@
           { required: true, message: `请选择驳回对象`, trigger: 'blur' }
         ]"
       >
-        <el-radio-group v-model="nextNode.nextNodeId">
+        <el-radio-group v-model="nextNode.nextNodeId" v-if="rejectObj.length != 0">
           <el-radio v-for="item of rejectObj" :key="item.id" :label="item.id">
             {{ item.name }}
           </el-radio>
         </el-radio-group>
+        <span v-else>暂无可驳回节点及对象</span>
       </el-form-item>
+      <!-- :rules="[
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
+        ]" -->
       <el-form-item
         prop="noticeType"
         label="通知方式"
-        :rules="[
-          { required: false, message: `请选择通知方式`, trigger: 'blur' }
-        ]"
+        v-show="nextNode.noticeList.length != 0 && rejectObj.length != 0"
       >
         <el-checkbox-group v-model="nextNode.noticeType">
           <el-checkbox
@@ -70,10 +72,10 @@
         <!-- size="small" -->
         <div style="text-align: right">
           <el-button
-            type="primary"
-            @click="subProcess('nextNode')"
+            :type="rejectObj.length == 0?'':'primary'"
+            @click="subProcess('nextNode',rejectObj.length == 0)"
           >
-            提交
+            {{rejectObj.length == 0?'取消':'提交'}}
           </el-button>
         </div>
       </el-form-item>
@@ -162,7 +164,11 @@ export default {
         });
     },
     // 提交表单
-    subProcess(formName) {
+    subProcess(formName,isNoObj) {
+      if(isNoObj){
+        this.quit(false);
+        return
+      }
       this.saveProcess(formName);
     },
     saveProcess(formName) {
@@ -192,6 +198,7 @@ export default {
                this.simpleTips && this.$message.success('操作成功');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
+                this.quit(false);
               }
             })
             .catch((err) => {
@@ -246,9 +253,11 @@ export default {
       util
         .ajax({ url: toTaskRejectHtml, params })
         .then((res) => {
-          const {
-            status,
-            message,
+         
+          console.log(res,'resssss')
+          this.loading = false;
+          if (res.status === 'success') {
+             const {
             data: {
               rejectTaskNodes,
               taskExamine,
@@ -257,8 +266,6 @@ export default {
               readOnlyNotificationType
             }
           } = res;
-          this.loading = false;
-          if (status === 'success') {
             this.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
             this.readOnlyNotificationType = readOnlyNotificationType;
             this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
@@ -280,7 +287,8 @@ export default {
                 (this.nextNode.nextNodeId = this.rejectObj[0].id);
             }
           } else {
-            this.$message.error(message || '系统错误，请联系管理员！');
+            this.$message.error(res.message || '系统错误，请联系管理员！');
+            this.quit(false);
           }
         })
         .catch((err) => {

package/packages/flow/src/reset.vue

@@ -181,7 +181,7 @@
             v-model="nextItemHandleDescription"
           />
         </el-form-item>
-        <el-form-item prop="noticeType" label="通知方式">
+        <el-form-item v-show="nextNode.noticeList.length != 0" prop="noticeType" label="通知方式">
           <el-checkbox-group
             v-if="showNoticeType"
             v-model="nextNode.noticeType"
@@ -540,9 +540,9 @@ export default {
             nextOperate,
             newOpinion
           } = this.nextNode;
-          if (noticeType.length === 0) {
-            return this.$message.warning('请选择通知方式');
-          }
+          // if (noticeType.length === 0) {
+          //   return this.$message.warning('请选择通知方式');
+          // }
           if (
             this.nodeInfoExtAttr.nodeType != 1 &&
             this.nodeInfoExtAttr.nodeType != 2 &&

package/packages/flow/src/startTaskRead.vue

@@ -50,6 +50,7 @@
             :multiple="type != 'transfer' ? multiple : false"
             :mix="type != 'transfer'"
             :selectUserList="selectUserList"
+            :disableds="readDisableds"
             :types="
               selectorTabs
                 ? selectorTabs
@@ -64,7 +65,7 @@
         </el-form-item>
 
         <el-form-item
-          v-if="configInfo.isCdjxjTaskHandle != 'true' && type != 'transfer'"
+          v-if="configInfo.isCdjxjTaskHandle != 'true' && type != 'transfer' && configInfo.groups&& configInfo.groups.length != 0"
           prop="cy"
           label="常用群组"
           ><el-checkbox-group v-model="selectCheck">
@@ -105,16 +106,16 @@
         >
           <el-input
             v-model="nextNode.handleExplain"
+            type="textarea"
+            :rows="3"
+
             placeholder="请填写办理说明"
           ></el-input>
         </el-form-item>
         <el-form-item
-          v-if="configInfo.isCdjxjTaskHandle != 'true'"
+          v-if="configInfo.isCdjxjTaskHandle != 'true' && noticeList.length > 0"
           prop="noticeType"
           label="通知方式"
-          :rules="[
-            { required: false, message: `请选择通知方式`, trigger: 'blur' }
-          ]"
         >
           <el-checkbox-group
             v-model="nextNode.noticeType"
@@ -227,6 +228,7 @@ export default {
       orgId: '',
       noticeList: [],
       userOptions: [],
+      readDisableds:[],
       selectCheck: [],
       selectUserList: [],
       transferInfo: {},
@@ -451,6 +453,9 @@ export default {
           const { status, data } = res;
           if (status === 'success') {
             this.configInfo = data;
+            if(data.alreadyReadUserIds){
+              this.readDisableds = data.alreadyReadUserIds.split(',');
+            }
             this.isMultiple();
           }
         })
@@ -477,9 +482,9 @@ export default {
         .ajax({
           url: findCodeValues,
           params: {
-            ccCode: 'notification_type',
+            ccCode: 'fenyue_msg_type',
             userId: util.getStorage('userId'),
-            pendingId:this.pendingId
+            // pendingId:this.pendingId
           }
         })
         .then((res) => {
@@ -609,6 +614,7 @@ export default {
             if(this.subParams){
               params = { ...params, ...this.subParams };
             }
+            delete this.configInfo.taskExamine.taskExamineParam;
             util
               .ajax({
                 url: taskReadHtml,
@@ -617,7 +623,7 @@ export default {
                   Accept: 'application/json,text/plain'
                 },
                 method: 'post',
-                data: params
+                data: {...params,...this.configInfo.taskExamine}
               })
               .then((res) => {
                 const { message, status } = res;

package/packages/flow/src/supervise.vue

@@ -26,7 +26,7 @@
           disabled
         />
       </el-form-item>
-      <el-form-item prop="noticeType" label="通知方式">
+      <el-form-item  v-show="nextNode.notificationType.length > 0" prop="noticeType" label="通知方式">
         <el-checkbox-group v-model="nextNode.noticeType">
           <el-checkbox
             v-for="(item, index) of nextNode.notificationType"
@@ -38,7 +38,7 @@
         </el-checkbox-group>
       </el-form-item>
       <!-- v-show="nextNode.noticeType.length != 0" -->
-      <el-form-item prop="notifyMessage" label="通知消息">
+      <el-form-item v-show="nextNode.noticeType.length != 0" prop="notifyMessage" label="通知消息">
         <es-input
           style="
             border-color: #ccc;
@@ -87,11 +87,11 @@ export default {
   },
   methods: {
     subProcess() {
-      if (this.nextNode.noticeType.length == 0) {
-        this.$message.warning('请选择通知方式');
-        return;
-      }
-      if (!this.nextNode.notifyMessage) {
+      // if (this.nextNode.noticeType.length == 0) {
+      //   this.$message.warning('请选择通知方式');
+      //   return;
+      // }
+      if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
         this.$message.warning('请填写通知消息内容');
         return;
       }
@@ -132,13 +132,20 @@ export default {
         })
         .then((res) => {
           this.loading.close();
-          if (res.rCode == 0) {
+          if (res.rCode == 0 || res.status == "success") {
             this.nextNode = { ...this.nextNode, ...res.results };
+            let arr = []
             this.nextNode.noticeType =
               res.results.defaultNotificationType.split(',');
+              this.nextNode.notificationType.map(x => {
+                if (this.nextNode.noticeType.indexOf(x.cciValue) != -1) {
+                  arr.push(x.cciValue);
+                }
+              })
+              this.nextNode.noticeType = arr
           } else {
             this.$message({
-              message: res.rMsg,
+              message: res.msg || res.message,
               type: 'error'
             });
             this.$emit('cancel');

package/packages/main/src/public/search.vue

@@ -232,7 +232,7 @@ export default {
     }
   },
   beforeCreate() {
-    this.handleSearchAll = debounce(500, (res) => {
+    this.handleSearchAll = debounce(1000, (res) => {
       this.searchAll(res);
     });
     this.handleSearchd = debounce(500, (obj, index) => {
@@ -321,6 +321,12 @@ export default {
       for (let i = 0; i < this.types.length; i++) {
         let item = this.types[i];
         if (keyWords && !this.hides.includes(item.name) && !item.hide) {
+          this.types[i].records = [];
+          this.types[i].totalCount = 0;
+          this.types[i].pageCount = 1;
+          this.types[i].pageNum = 0;
+          this.$set(this.loadings, item.id || String(i), true);
+          this.$set(this.noMore, item.id || String(i), false);
           if (item.name == '菜单' && this.menus.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);

package/packages/main/src/simplicity/index.vue

@@ -883,7 +883,7 @@ export default {
             this.singleLogout = results[i].singleLogout.split(',');
           }
           if (results[i].userInfoContents) {
-            this.userInfoContents = results[i].userInfoContents;
+            this.userInfoContents = JSON.parse(results[i].userInfoContents);
           }
           if (results[i].webPageWatermark) {
             try {

package/packages/main/src/simplicity/user.vue

@@ -110,7 +110,6 @@ export default {
   watch: {
     notify: {
       immediate: true,
-      userInfo: {},
       handler(val) {
         if (val) {
           this.checked = val.split(',');

package/packages/select/src/main.vue

@@ -658,6 +658,7 @@ export default {
         } else {
           dom = [this.getLabel(this.models, this.results)];
         }
+        console.log('dom', dom);
         return h(
           'div',
           {
@@ -667,9 +668,12 @@ export default {
                 'es-textarea__inner el-textarea__inner': this.multiple,
                 'el-input__inner es-input__inner': !this.multiple
               }
-            ]
+            ],
+            domProps: {
+              innerHTML: dom.join(this.symbol)
+            }
           },
-          [dom.join(this.symbol)]
+          []
         );
       }
       let doms = [];

package/packages/tree/src/main.vue

@@ -219,7 +219,7 @@ export default {
     //懒加载
     lazy: {
       type: Boolean,
-      default: true
+      default: false
     },
     onChange: Function,
     onSearch: Function,

package/packages/upload/src/main.vue

@@ -239,12 +239,7 @@ export default {
       type: Boolean,
       default: true
     },
-    headers: {
-      type: Object,
-      default() {
-        return util.getStorage();
-      }
-    },
+    headers: Object,
     listType: {
       type: String,
       default: 'table' // text,table,picture,picture-card

package/src/config/api.js

@@ -1,7 +1,7 @@
 const flowPendingPrefix =
   window.flowPendingPrefix ||
   localStorage.getItem('flowPendingPrefix') ||
-  '/bpm';
+  '/oa';
 // 登录
 export const doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
 export const doUserLogin = '/sso2/signIn/auth/doUserLogin'; // 一般的账号密码认证含验证码验证

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.93',
+  version: '0.6.95',
   install,
   Button,
   ButtonGroup,