eoss-ui 0.6.92 → 0.6.94

package/packages/data-table/src/main.vue

@@ -32,7 +32,8 @@
         tabs: handleTabs,
         reset: hanleReset,
         cancel: hanleCancel,
-        ...(toolbars.events || {})
+        toolbarChange: toolbarChange,
+        ...toolbarEvents
       }"
     ></es-toolbar>
     <p v-if="title" ref="title" class="es-table-title" v-html="title"></p>
@@ -309,7 +310,7 @@ export default {
     },
     // 工具栏配置
     toolbar: {
-      type: [Array, Boolean],
+      type: [Array, Object, Boolean],
       default: false
     },
     showLabel: Boolean,
@@ -508,6 +509,7 @@ export default {
       isEncryption: this.isFieldsEncryption,
       requests: [],
       toolbars: [],
+      toolbarEvents: {},
       hasThead: false,
       theadData: [],
       list: [],
@@ -705,9 +707,13 @@ export default {
           ];
         }
         return this.toolbar;
-      } else {
+      } else if (Array.isArray(this.toolbar)) {
         this.toolbars = this.toolbar;
         return true;
+      } else {
+        this.toolbars = this.toolbar.contents;
+        this.toolbarEvents = this.toolbar.events || {};
+        return true;
       }
     },
     optionDatas: {
@@ -1313,6 +1319,9 @@ export default {
       this.$emit('edit', data, this.list);
       this.$emit('change', data, this.list);
     },
+    toolbarChange(...args) {
+      this.$emit('toolbar-change', ...args);
+    },
     handleAjax(handle, row) {
       this.changeLoading(true, `${handle.text}中...`);
       let params = handle.param || {};

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

@@ -97,7 +97,7 @@
 
       <el-button
         type="primary"
-        style="width: calc(100% - 18px);margin:8px auto"
+        style="width: calc(100% - 18px); margin: 8px auto"
         @click="handleClickCirculate()"
       >
         提交
@@ -517,7 +517,7 @@
                   />
                 </el-form-item>
                 <el-form-item
-                  v-if="isHideOtherOrg  && nextNode.isReturnSubmitter != 1"
+                  v-if="isHideOtherOrg && nextNode.isReturnSubmitter != 1"
                   prop="nextOtherOrgObj"
                   :label="otherOrgName ? otherOrgName : '外单位'"
                 >
@@ -673,9 +673,12 @@
           :label-position="formLabelPosition"
           :showBtn="false"
           :formTitle="formTitle"
+          :urgencyLevel="urgencyLevel"
+          :messageType="newsList"
           :copy-history="freeStartFlowParams.pendedHistoryHandle"
           :process-definition-id="freeStartFlowNextNode || nodeInfo.nextNode"
           :opinion="value"
+          :keyCount="msgTypeCount"
           :pendingId="pendingId"
           :taskExamineParam="freeStartFlowParams.newFlowStartNodeItemName"
           :taskParams="taskParams"
@@ -703,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>
@@ -751,30 +754,27 @@
         </div>
       </div>
       <el-form
-          ref="nextNode"
-          :model="isFlow ? nodeInfo : nextNode"
-          v-if="isEndMessage"
-          class="demo-dynamic"
-          :label-width="
-            startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
-          "
-          style="padding:0px 8px"
-          :label-position="formLabelPosition"
-        >
-      <el-form-item
-                  prop="nextItemHandleDescription"
-                  label="办结意见"
-                >
-                  <el-input
-                    placeholder="请输入办结意见"
-                    type="textarea"
-                    :autosize="{ minRows: 2 }"
-                    v-model="endMessage"
-                    @change="handleEndMessageChange"
-                  />
-                </el-form-item>
+        ref="nextNode"
+        :model="isFlow ? nodeInfo : nextNode"
+        v-if="isEndMessage"
+        class="demo-dynamic"
+        :label-width="
+          startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
+        "
+        style="padding: 0px 8px"
+        :label-position="formLabelPosition"
+      >
+        <el-form-item prop="nextItemHandleDescription" label="办结意见">
+          <el-input
+            placeholder="请输入办结意见"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            v-model="endMessage"
+            @change="handleEndMessageChange"
+          />
+        </el-form-item>
       </el-form>
-      
+
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -790,8 +790,10 @@
           <el-button class="es-button-agree" @click="subProcess('不同意。')"
             >不同意</el-button
           >
-          <el-button class="es-button-agree-save"
-          v-if="!isHideTemporarySave" @click="saveInfo()"
+          <el-button
+            class="es-button-agree-save"
+            v-if="!isHideTemporarySave"
+            @click="saveInfo()"
             >暂存</el-button
           >
         </div>
@@ -806,7 +808,9 @@
         >
           <el-button
             v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-            v-for="item of hideBtn || isHideTemporarySave ? btnList.slice(0, 1) : btnList"
+            v-for="item of hideBtn || isHideTemporarySave
+              ? btnList.slice(0, 1)
+              : btnList"
             :key="item.name"
             :type="item.type"
             :style="btnStyle"
@@ -1001,7 +1005,7 @@
           :simpleTips="simpleTips"
           :show-reject="showReject"
           :news-info="nextNode.notificationMsg"
-          @cancel="closeProcess(true, 'showReject')"
+          @cancel="closeProcess($event, 'showReject')"
         />
       </es-dialog>
       <es-dialog
@@ -1139,7 +1143,8 @@ import {
   checkForeignOrgStartedCircularRead,
   checkBusinessIdStartedReadTransferHandle,
   taskHandleHtml,
-  getNodeInfoForStart
+  getNodeInfoForStart,
+  getUrgencyLevelChangedNotificationType
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 export default {
@@ -1195,6 +1200,10 @@ export default {
         callBack();
       }
     },
+    urgencyLevel: {
+      type: [String, Number],
+      default: ''
+    },
     beforeSubmit: Function,
     title: { type: String, default: '流程办理' },
     formTitle: { type: String, default: '' },
@@ -1218,15 +1227,15 @@ export default {
       type: [String, Number],
       default: 10
     },
-    isEndMessage: { type: Boolean, default: false },
+    isEndMessage: { type: Boolean, default: false }
   },
   data() {
     return {
       styles: {},
       optionsKey: 0,
-      endMessage:'',
-      isHideTemporarySave:false,
-      oldNextOperate:'',
+      endMessage: '',
+      isHideTemporarySave: false,
+      oldNextOperate: '',
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
@@ -1409,6 +1418,7 @@ export default {
       currentOrgName: '', //本单位名称
       otherOrgName: '', //外单位名称
       needRetrialAuth: false, //是否二次鉴权
+      msgTypeCount: 0,
       nodeInfo: {
         nextNode: '',
         nextUser: '',
@@ -1433,9 +1443,21 @@ export default {
     }
   },
   watch: {
+    urgencyLevel: {
+      handler(val) {
+        if (val && this.msgTypeCount != 0) {
+          this.getAdminMsgType();
+        } else {
+          this.msgTypeCount++;
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     isCirculate: {
       handler(val) {
         if (!val && this.showCirculate != undefined) {
+        this.showCirculate = val;
           this.getInfo();
         }
         this.showCirculate = val;
@@ -1532,12 +1554,36 @@ export default {
     }
   },
   methods: {
-    handleEndMessageChange(){
-      this.$emit('endMessageChange',this.endMessage)
+    getAdminMsgType() {
+      let params = {
+        url: getUrgencyLevelChangedNotificationType,
+        params: { urgencyLevel: this.urgencyLevel }
+      };
+      util.ajax(params).then((res) => {
+        if (res.rCode == 0) {
+          this.newsList = res.results.latestChangedNotificationType;
+          let arr = [];
+          this.newsList.map((item) => {
+            this.nextNode.notificationType.map((x) => {
+              if (x == item.cciValue) {
+                arr.push(x);
+              }
+            });
+          });
+          this.nextNode.notificationType = arr;
+        }
+      });
+    },
+    handleEndMessageChange() {
+      this.$emit('endMessageChange', this.endMessage);
     },
     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) {
@@ -1561,7 +1607,8 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success') {
-          this.isHideTemporarySave = res.data.nodeExtAttr.isHideTemporarySave == 1
+          this.isHideTemporarySave =
+            res.data.nodeExtAttr.isHideTemporarySave == 1;
           this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           this.directCreateCircularReadWhenFlowStarted =
             res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
@@ -1593,7 +1640,7 @@ export default {
       this.freeStartFlowParams.startFlowBusinessId =
         this.taskExamineInfo.businessId;
       this.freeStartFlowNextNode = this.taskExamineInfo.processDefinitionId;
-      const { businessId, appId, processDefinitionId, pendingId,isSubFlow } =
+      const { businessId, appId, processDefinitionId, pendingId, isSubFlow } =
         this.taskExamineInfo;
       let params = {
         businessId,
@@ -1910,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') {
@@ -1997,7 +2045,7 @@ export default {
       };
       this.loading = util.loading(this.$loading, '保存中...');
       util
-        .ajax({ url: tempSave, data:params,method: 'post' })
+        .ajax({ url: tempSave, data: params, method: 'post' })
         .then((res) => {
           const { status, message } = res;
           if (!isSave) this.loading.close();
@@ -2630,11 +2678,12 @@ export default {
       } else {
         this.nextNode.nextUserId = '';
       }
-      if(isNextNode){
-        this.oldNextOperate = this.operationList.filter((x) => x.key == val)[0]
-          .nextOperate
-      }else{
-        this.oldNextOperate = ''
+      if (isNextNode) {
+        this.oldNextOperate = this.operationList.filter(
+          (x) => x.key == val
+        )[0].nextOperate;
+      } else {
+        this.oldNextOperate = '';
       }
       this.options = [];
       this.selectUserList = [];
@@ -2851,12 +2900,13 @@ export default {
                 taskOperations.push({
                   key: x.nodeId,
                   value: x.nodeName,
-                  nextOperate:x.nextOperate,
+                  nextOperate: x.nextOperate,
                   isNextNode: true
                 });
               });
             }
-            this.isHideTemporarySave = nodeInfoMap.nodeExtAttr.isHideTemporarySave == 1
+            this.isHideTemporarySave =
+              nodeInfoMap.nodeExtAttr.isHideTemporarySave == 1;
             this.pendingItemHandleDescription = pendingItemHandleDescription;
             if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
               this.currentOrgSelectorTabs =
@@ -2865,7 +2915,10 @@ export default {
                 currentOrgSelectorParams.currentOrgRange.split(',');
               this.currentOrgSelectorTabs.map((x, i) => {
                 this.currentOrgSelectorParams[x] = {
-                  filid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i]
+                  filid:
+                    currentOrgparams[i] == 'my'
+                      ? choiceOrgId
+                      : currentOrgparams[i]
                 };
               });
             }
@@ -3211,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 || '系统错误，请联系管理员！');
@@ -3399,7 +3455,8 @@ export default {
         (this.currentNodeIsCircularReadNode ||
           (this.isHideOtherOrg && this.isHideCurrentOrg)) &&
         this.nextNode.nextCurrentOrgObj.length == 0 &&
-        this.nextNode.nextOtherOrgObj.length == 0  && this.nextNode.isReturnSubmitter != 1
+        this.nextNode.nextOtherOrgObj.length == 0 &&
+        this.nextNode.isReturnSubmitter != 1
       ) {
         this.$message.warning(`请选择下步办理对象!`);
         return false;
@@ -3481,7 +3538,11 @@ export default {
           }
           if (
             (this.nextNode.nextOperate != 0 &&
-            this.nextNode.nextOperate != 1 && this.oldNextOperate === '') || (this.oldNextOperate !== '' && this.oldNextOperate != 0 && this.oldNextOperate != 1)
+              this.nextNode.nextOperate != 1 &&
+              this.oldNextOperate === '') ||
+            (this.oldNextOperate !== '' &&
+              this.oldNextOperate != 0 &&
+              this.oldNextOperate != 1)
           ) {
             delete this.nextNode.nextNodeId;
           }
@@ -3497,10 +3558,13 @@ export default {
           if (!this.isCanPreAddSign || this.nextNode.isAddSign != '1') {
             delete this.nextNode.addSignMode;
           }
-         
+
           let params = {
             ...this.nextNode,
-            nextOperate:this.oldNextOperate!==''?this.oldNextOperate : this.nextNode.nextOperate, 
+            nextOperate:
+              this.oldNextOperate !== ''
+                ? this.oldNextOperate
+                : this.nextNode.nextOperate,
             pendingId: this.pendingId,
             opinion:
               this.isForceDisplayDefaultOptionForPrefix &&

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>
@@ -443,7 +443,19 @@ export default {
       type: String,
       default: ''
     },
-    showBtn: { type: Boolean, default: true }
+    showBtn: { type: Boolean, default: true },
+    messageType:{
+      type:Array,
+      default: () => []
+    },
+    urgencyLevel:{
+      type:[Number,String],
+      default:''
+    },
+    keyCount:{
+      type:[Number,String],
+      default:0
+    },
   },
   data() {
     return {
@@ -534,11 +546,30 @@ export default {
         nodeInfo: [],
         userInfo: [],
         handleExplain: '',
-        noticeList: []
+        noticeList: [],
+        msgTypeCount:0
       }
     };
   },
   watch: {
+    messageType:{
+      handler(val) {
+        if (this.urgencyLevel) {
+          this.nextNode.noticeList = val;
+          let arr = [];
+          this.nextNode.noticeList.map((item) => {
+            this.nextNode.noticeType.map((x) => {
+              if (x == item.cciValue) {
+                arr.push(x);
+              }
+            });
+          });
+          this.nextNode.noticeType = arr;
+        }else{
+          this.msgTypeCount++
+        }
+      }
+    },
     processDefinitionId(val) {
       Object.assign(this.$data, this.$options.data());
       this.getUserInfo();
@@ -577,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

@@ -30,12 +30,13 @@
           </el-radio>
         </el-radio-group>
       </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.lemgth != 0"
       >
         <el-checkbox-group v-model="nextNode.noticeType">
           <el-checkbox
@@ -192,6 +193,7 @@ export default {
                this.simpleTips && this.$message.success('操作成功');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
+                this.quit(false);
               }
             })
             .catch((err) => {
@@ -246,9 +248,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 +261,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 +282,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

@@ -109,12 +109,9 @@
           ></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"