eoss-ui 0.6.61 → 0.6.62

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

@@ -2,7 +2,7 @@
   <div class="commonOpinion">
     <el-form
       :model="form"
-      :rules="rules"
+      :rules="required?rules:{}"
       ref="ruleForm"
       label-width="0"
     >
@@ -145,7 +145,8 @@ export default {
     rows: {
       type: [Number,String],
       default: 10
-    }
+    },
+    required:{type:Boolean,default:false}
   },
   mounted() {
     if (this.nodeFixedOpinionSelectList.length > 0) {

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

@@ -16,14 +16,19 @@
           { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="sendInfo.notificationType" style="display:contents">
+        <el-checkbox-group
+          v-model="sendInfo.notificationType"
+          style="display: contents"
+        >
           <el-checkbox
             v-for="item of notificationList"
             :key="item.cciValue"
             :label="item.cciValue"
-            :disabled="readOnlyNotificationType
-                  ? readOnlyNotificationType.indexOf(item.cciValue) != -1
-                  : false"
+            :disabled="
+              readOnlyNotificationType
+                ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                : false
+            "
           >
             {{ item.shortName }}
           </el-checkbox>
@@ -56,15 +61,13 @@
         <el-table-column label="状态" show-overflow-tooltip>
           <template slot-scope="scope"
             ><span
-              :style="
-                `${
-                  scope.row.pendstate == 0
-                    ? 'color:red'
-                    : scope.row.pendstate == 1
-                    ? 'color:green'
-                    : ''
-                }`
-              "
+              :style="`${
+                scope.row.pendstate == 0
+                  ? 'color:red'
+                  : scope.row.pendstate == 1
+                  ? 'color:green'
+                  : ''
+              }`"
               >{{ scope.row.querykeywords }}</span
             ></template
           >
@@ -76,13 +79,11 @@
         </el-table-column>
       </el-table>
       <el-form-item>
-        <div style="text-align:right">
+        <div style="text-align: right">
           <el-button type="primary" size="small" @click="subMit">
             确定
           </el-button>
-          <el-button @click="quit" size="small">
-            取消
-          </el-button>
+          <el-button @click="quit" size="small"> 取消 </el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -114,6 +115,10 @@ export default {
     newsList: {
       type: Array,
       default: () => []
+    },
+    simpleTips: {
+      type: Boolean,
+      default: true
     }
   },
   mounted() {
@@ -146,17 +151,17 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           this.loading = false;
           if (status === 'success') {
-            this.$message.success('操作成功');
+            this.simpleTips && this.$message.success('操作成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -177,13 +182,13 @@ export default {
         let rows = this.sendTable.filter(
           (item, index) => item.pendstate == 2 && index == 0
         );
-        rows.forEach(row => {
+        rows.forEach((row) => {
           this.$refs.multipleTable.toggleRowSelection(row);
         });
       });
     },
     handleSelectionChange(val) {
-      let ids = val.map(item => {
+      let ids = val.map((item) => {
         if (item.pendstate == 2) {
           return item.id;
         }
@@ -197,17 +202,24 @@ export default {
           url: toSendMsg,
           params: { pendingId: this.$attrs.pendingId }
         })
-        .then(res => {
+        .then((res) => {
           const {
             status,
             message,
-            data: { title, wfHistoryList, appId,notificationMessageReadOnly, readOnlyNotificationType}
+            data: {
+              title,
+              wfHistoryList,
+              appId,
+              notificationMessageReadOnly,
+              readOnlyNotificationType
+            }
           } = res;
           this.loading = false;
           if (status === 'success') {
             this.sendInfo.title = title;
-            this.readOnlyNotificationType =readOnlyNotificationType;
-            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
+            this.readOnlyNotificationType = readOnlyNotificationType;
+            this.notificationMessageReadOnly =
+              notificationMessageReadOnly == 'true';
             this.appId = appId;
             this.sendTable = wfHistoryList;
             this.checkList();
@@ -215,7 +227,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);

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

@@ -4,7 +4,7 @@
       ref="infoList"
       :model="infoList"
       class="demo-dynamic"
-      label-width="100px"
+      label-width="120px"
     >
       <el-form-item v-if="isSinglePage" prop="opinion" label="意见">
         <CommonOpinions @change="(val) => (opinion = val)" />
@@ -18,7 +18,7 @@
               ? currentOrgName
               : '本单位'
             : type == 'startDraf'
-            ? '呈送单位'
+            ? '呈送单位/对象'
             : type === 'taskReview'
             ? '复核人'
             : type === 'twoOfficesDispatch'
@@ -49,7 +49,7 @@
               ? ['enterprise', 'employee']
               : ['enterprise']
           "
-          :params="params"
+          :params="type == 'startDraf'?otherParams:params"
           :tabs="currentOrgTabsParam"
           :disabled="disabled"
           :onlyName="onlyName"
@@ -160,6 +160,7 @@ export default {
     defaultOpinion: { type: String, default: '' },
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
+    simpleTips:  { type: Boolean, default: true },
     multiple: { type: Boolean, default: true }
   },
   inheritAttrs: false,
@@ -243,7 +244,7 @@ export default {
           const { message, status } = res;
           this.loading = false;
           if (status === 'success') {
-            this.$message.success('提交成功');
+           this.simpleTips && this.$message.success('提交成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -361,6 +362,7 @@ export default {
                   ).userModel.orgId;
                 }
               }
+              
               if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
                 this.otherMix =
                   res.data.customizedConfig.foreignOrgSelectorSelectMix ==
@@ -499,7 +501,7 @@ export default {
           const { message, status } = res;
           this.loading = false;
           if (status == 'success') {
-            this.$message.success('提交成功');
+           this.simpleTips && this.$message.success('提交成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/flow/src/main.vue

@@ -10,6 +10,7 @@
       :pending-id="pendingId"
       :opinion="value"
       type="create"
+      :simpleTips="simpleTips"
       :key="StartTaskReadKey"
       typeCode="read"
       :param="param"
@@ -20,12 +21,14 @@
     />
     <Supervise
       :businessId="businessId"
+      :simpleTips="simpleTips"
       @cancel="closeProcess($event)"
       v-else-if="typeCode == 'supervise'"
     />
     <reset
       style="height: 100%"
       :type="newTypeCode"
+      :simpleTips="simpleTips"
       :appId="resetAppId"
       @cancel="closeProcess($event)"
       :flowParams="param"
@@ -67,6 +70,7 @@
           @change="(val) => (value = val)"
           :opinion="value"
           :rows="rows"
+          :required="isOpinionRequired == 1"
           :isBanInputOpinion="isBanInputOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
         />
@@ -713,6 +717,24 @@
         >
       </div>
       <!-- 弹窗内容 -->
+      <es-dialog
+        v-if="circulateVisible"
+        append-to-body
+        height="400"
+        ref="circulateVisible"
+        title="发起传阅"
+        :close-on-click-modal="false"
+        :visible.sync="circulateVisible"
+        :closeParent="closeParent"
+      >
+        <circulate
+          :businessId="businessId"
+          :processDefinitionId="nodeInfo.nextNode"
+          :simpleTips="simpleTips"
+          :oldOption="value"
+          @cancel="closeProcess($event, 'circulateVisible')"
+        />
+      </es-dialog>
       <es-dialog
         v-if="handleVisible"
         append-to-body
@@ -726,6 +748,7 @@
       >
         <ProcessForm
           :id="freeStartFlowParams.startFlowBusinessId || businessIds"
+          :simpleTips="simpleTips"
           :is-free-start-flow="
             freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
           "
@@ -764,6 +787,7 @@
         <ProcessReject
           :pending-id="pendingId"
           :option="value"
+          :simpleTips="simpleTips"
           :show-reject="showReject"
           :news-info="nextNode.notificationMsg"
           @cancel="closeProcess(true, 'showReject')"
@@ -783,6 +807,7 @@
           :pending-id="pendingId"
           :opinion="value"
           :type="taskReadType"
+          :simpleTips="simpleTips"
           :taskExamine="taskExamineInfo"
           :news-info="nextNode.notificationMsg"
           @cancel="closeProcess($event, 'showTaskRead')"
@@ -814,6 +839,7 @@
       >
         <SendMsg
           @cancel="closeProcess($event, 'showSendMsg')"
+          :simpleTips="simpleTips"
           :pendingId="pendingId"
           :newsList="newsList"
         />
@@ -830,6 +856,7 @@
       >
         <TaskUnionExamine
           @cancel="closeProcess($event, 'showTaskUnionExamine')"
+          :simpleTips="simpleTips"
           :pendingId="pendingId"
           :defaultOpinion="nodeDefaultSubmitOpinion"
           :oldOption="value"
@@ -851,6 +878,7 @@
           v-if="showFreeStartFlow"
           isStartFlow
           v-bind="freeStartFlowParams"
+          :simpleTips="simpleTips"
           @close="showFreeStartFlow = false"
           @success="freeStartFlowSuccess"
           :btnList="[{ text: '提交', event: 'sub', type: 'primary' }]"
@@ -878,6 +906,7 @@ import TaskUnionExamine from './component/taskUnionExamine.vue';
 import FreeStartFlow from './freeStartFlow.vue';
 import SelectUser from './selectUser.vue';
 import Supervise from './supervise.vue';
+import circulate from './component/Circulate.vue';
 import {
   findSysCodes,
   getHandleInfoHtml,
@@ -896,9 +925,11 @@ import {
   isCanStartSubFlow,
   checkForeignOrgStartedCircularRead,
   checkBusinessIdStartedReadTransferHandle,
-  taskHandleHtml
+  taskHandleHtml,
+  getNodeInfoForStart
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
+import Circulate from './component/Circulate.vue';
 export default {
   name: 'EsFlow',
   componentName: 'EsFlow',
@@ -914,6 +945,7 @@ export default {
     [SelectUser.name]: SelectUser,
     [TaskUnionExamine.name]: TaskUnionExamine,
     [FreeStartFlow.name]: FreeStartFlow,
+    circulate,
     Preset,
     Reset,
     Supervise
@@ -928,6 +960,7 @@ export default {
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
+
     btnList: {
       type: Array,
       default: () => [
@@ -964,6 +997,7 @@ export default {
     return {
       styles: {},
       userModel: {},
+      simpleTips: true,
       showFreeStartFlow: false, //自由发起流程弹窗
       freeStartFlowParams: {}, //自由发起流程参数
       freeStartFlowNextNode: undefined,
@@ -1056,6 +1090,7 @@ export default {
       isChooseNextNode: 1, //是否展示下步操作
       isHandleExplain: 0, //是否展示办理说明
       handleVisible: false,
+      circulateVisible: false,
       defaultNextNode: '', //默认节点
       showFlowChart: false, // 展示流程图弹窗
       isReject: false, // 是否驳回
@@ -1099,6 +1134,7 @@ export default {
       handleMode: '',
       countersignaturetypeCode: 0, //是否展示处理方式
       presetEdit: 0,
+      directCreateCircularReadWhenFlowStarted: false,
       isShowNextUser: true, //是否展示下步办理人
       nextUserTypes: ['employee', 'persongroup'], //下步办理人类型配置
       nextUserTabs: {}, //下步办理人权限配置
@@ -1251,6 +1287,20 @@ export default {
     }
   },
   methods: {
+    getNodeInfoForStartFlow(processDefinitionId) {
+      let params = {
+        url: getNodeInfoForStart,
+        params: { processDefinitionId }
+      };
+      util.ajax(params).then((res) => {
+        if (res.status == 'success') {
+          this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
+          this.directCreateCircularReadWhenFlowStarted =
+            res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
+          this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
+        }
+      });
+    },
     changeCustomLimitTime(val) {
       if (!Number(val) || val.indexOf('.') != -1 || Number(val) < 0) {
         this.$message.warning('请输入正确的天数');
@@ -1287,9 +1337,11 @@ export default {
     },
     freeStartFlowSuccess() {
       this.showFreeStartFlow = false;
-      this.$emit('success');
+      this.flowSuccess(true);
+      // this.$emit('success');
     },
     handleChange(val) {
+      this.getNodeInfoForStartFlow(val);
       this.$parent.$emit('flowChange', val);
     },
     getsubProcessColumns() {
@@ -1458,8 +1510,9 @@ export default {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
-                this.$message.success('提交成功');
-                this.$emit('success');
+                this.flowSuccess();
+                // this.$message.success('提交成功');
+                // this.$emit('success');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
                 this.$emit('error');
@@ -1504,12 +1557,15 @@ export default {
               isCanFenyue,
               taskExamine,
               taskReadOpinionRequired,
-              isCanReadTransferHandle
+              isCanReadTransferHandle,
+              defaultNotificationMessage
             }
           } = res;
           if (status === 'success') {
             this.taskExamineInfo = taskExamine;
+            this.nodeName = this.nodename || taskExamine.nodeName || '分阅';
             this.taskReadOpinionRequired = taskReadOpinionRequired;
+            this.nextNode.notificationMsg = defaultNotificationMessage
             this.isCanReadTransferHandle = isCanReadTransferHandle;
             this.isCanFenyue = isCanFenyue;
             if (this.nodeName) {
@@ -1833,8 +1889,9 @@ export default {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
-                this.$message.success('提交成功');
-                this.$emit('success');
+                this.flowSuccess();
+                // this.$message.success('提交成功');
+                // this.$emit('success');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
                 this.$emit('error');
@@ -2081,8 +2138,9 @@ export default {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
-                this.$message.success('提交成功');
-                this.$emit('success');
+                this.flowSuccess();
+                // this.$message.success('提交成功');
+                // this.$emit('success');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
                 this.$emit('error');
@@ -2272,7 +2330,6 @@ export default {
      **/
     selecNext(val, type, isDef) {
       this.loading = util.loading(this.$loading, '加载中...');
-      console.log(val, type, isDef);
       if (this.multiple) {
         this.nextNode.nextUserId = [];
       } else {
@@ -2459,9 +2516,13 @@ export default {
                 canPresetRead,
                 isCdjxjTaskHandle,
                 taskButtonList,
+                simpleTips,
                 isCanPreAddSign
               }
             } = res;
+            if (simpleTips != undefined) {
+              this.simpleTips = simpleTips;
+            }
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
             this.circularReadParamsMap = circularReadParamsMap || {};
@@ -2706,7 +2767,8 @@ export default {
         (val == true && type != 'taskRead') ||
         val == 'transfer'
       ) {
-        this.$emit('success');
+        this.flowSuccess(true);
+        // this.$emit('success');
       }
     },
     /**
@@ -2754,6 +2816,9 @@ export default {
           const { status, message, data } = res;
           this.loading.close();
           if (status === 'success') {
+            if (data.simpleTips != undefined) {
+              this.simpleTips = data.simpleTips;
+            }
             this.isStartFlowChartView = data.isStartFlowChartView;
             if (
               !Object.keys(data).length ||
@@ -2956,25 +3021,50 @@ export default {
         this.$message.warning('请选择输入审批意见');
         return false;
       }
-      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
-        this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
-        return false;
-      }
+      // if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+      //   this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+      //   return false;
+      // }
 
       if (
-        this.currentNodeIsCircularReadNode &&
+        (this.currentNodeIsCircularReadNode ||
+          (this.isHideOtherOrg && this.isHideCurrentOrg)) &&
         this.nextNode.nextCurrentOrgObj.length == 0 &&
         this.nextNode.nextOtherOrgObj.length == 0
       ) {
-        this.$message.warning(`请选择处理对象!`);
+        this.$message.warning(`请选择下步办理对象!`);
         return false;
       }
       return true;
     },
+    flowSuccess(hideMessage) {
+      if (!this.simpleTips) {
+        this.$alert('提交成功', '', {
+          confirmButtonText: '确定',
+          type: 'success',
+          callback: (action) => {
+            this.$emit('success');
+          }
+        });
+      } else {
+        if (!hideMessage) {
+          this.$message.success('提交成功');
+        }
+        this.$emit('success');
+      }
+    },
+
     sendData(freetype) {
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
-          if (this.isFlow) return (this.handleVisible = true);
+          if (this.isFlow) {
+            if (this.directCreateCircularReadWhenFlowStarted) {
+              this.circulateVisible = true;
+            } else {
+              this.handleVisible = true;
+            }
+            return;
+          }
           let nextUserId = [];
           if (this.multiple) {
             this.nextNode.nextUserId &&
@@ -3105,8 +3195,7 @@ export default {
               const { status, message } = res;
               this.loading.close();
               if (status === 'success') {
-                this.$message.success('提交成功');
-                this.$emit('success');
+                this.flowSuccess();
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
                 this.$emit('error');

package/packages/flow/src/processForm.vue

@@ -351,6 +351,10 @@ export default {
       type: String,
       default: ''
     },
+    simpleTips:{
+      type:Boolean,
+      default: true
+    },
     formType: {
       type: String,
       default: 'freeStart'
@@ -755,7 +759,7 @@ export default {
               this.loading = false;
               if (status === 'success' || res.rCode == 0) {
                 this.quit(true);
-                this.$message.success('操作成功');
+              this.simpleTips && this.$message.success('操作成功');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
               }

package/packages/flow/src/processReject.vue

@@ -97,7 +97,8 @@ export default {
     pendingId: { type: String, default: '' },
     newsInfo: { type: String, default: '' },
     showReject: { type: Boolean },
-    option: { type: String, default: '' }
+    option: { type: String, default: '' },
+    simpleTips:{type:Boolean,default:true}
   },
   data() {
     return {
@@ -186,7 +187,7 @@ export default {
               this.loading = false;
               if (status === 'success') {
                 this.quit(true);
-                this.$message.success('操作成功');
+               this.simpleTips && this.$message.success('操作成功');
               } else {
                 this.$message.error(message || '系统错误，请联系管理员！');
               }

package/packages/flow/src/startTaskRead.vue

@@ -185,6 +185,7 @@ export default {
   },
   props: {
     pendingId: { type: String, default: '' },
+    simpleTips:{type:Boolean,default:true},
     newsInfo: { type: String, default: '' },
     type: { type: String, default: '' },
     option: { type: String, default: '' },
@@ -510,7 +511,7 @@ export default {
         .then((res) => {
           const { message, status } = res;
           if (status === 'success') {
-            this.$message.success('操作成功');
+           this.simpleTips && this.$message.success('操作成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -597,7 +598,7 @@ export default {
                 const { message, status } = res;
                 this.loading = false;
                 if (status === 'success') {
-                  this.$message.success('操作成功');
+                 this.simpleTips && this.$message.success('操作成功');
                   this.quit(true);
                 } else {
                   this.$message.error(message || '系统错误，请联系管理员！');