eoss-ui 0.6.61 → 0.6.63

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

@@ -0,0 +1,322 @@
+<template>
+  <div class="es-flow-index task-union-examine" v-loading="loading">
+    <el-form
+      ref="infoList"
+      :model="infoList"
+      class=""
+      label-width="120px"
+    >
+      <el-form-item
+        v-if="isHideCurrentOrg == 0"
+        prop="nextCurrentOrgObj"
+        label="本单位"
+      >
+        <SelectUser
+          :nextUser="infoList.nextCurrentOrgObj"
+          :multiple="newMultiple"
+          mix
+          @change="changeSelectUser($event, 'nextCurrentOrgObj')"
+          :types="['department', 'employee']"
+          :params="params"
+        />
+      </el-form-item>
+      <el-form-item prop="nextOtherOrgObj" label="外单位">
+        <SelectUser
+          :nextUser="infoList.nextOtherOrgObj"
+          :multiple="newMultiple"
+          @change="changeSelectUser($event, 'nextOtherOrgObj')"
+          mix
+          :types="['enterprise', 'department']"
+          :params="otherParams"
+        />
+      </el-form-item>
+      <el-form-item
+        prop="noticeType"
+        label="通知方式"
+        :rules="[
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
+        ]"
+      >
+        <el-checkbox-group
+          v-model="infoList.noticeType"
+          style="display: contents"
+        >
+          <el-checkbox
+            v-for="item of infoList.noticeList"
+            :key="item.cciValue"
+            :label="item.cciValue"
+            :disabled="
+              readOnlyNotificationType
+                ? readOnlyNotificationType.indexOf(item.cciValue) != -1
+                : false
+            "
+          >
+            {{ item.shortName }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item
+        v-show="infoList.noticeType.length != 0"
+        prop="noticeInfo"
+        label="通知消息"
+      >
+        <es-input
+          style="
+            border-color: #ccc;
+            padding: 5px;
+            border-radius: 5px;
+            font-size: 13px;
+          "
+          type="textarea"
+          v-model="infoList.noticeInfo"
+          :readonly="notificationMessageReadOnly"
+        />
+        <!-- <span>{{ infoList.noticeInfo }}</span> -->
+      </el-form-item>
+    </el-form>
+    <div style="text-align: right">
+      <el-button type="primary" size="small" @click="subMit"> 确定 </el-button>
+      <el-button @click="quit" size="small"> 取消 </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import CommonOpinions from './CommonOpinions.vue';
+import SelectUser from '../selectUser.vue';
+import {
+  findSysCodes,
+  getNotificationMsg,
+  findCodeValues,
+  directStartTaskCircularRead,
+} from 'eoss-ui/src/config/api';
+import util from 'eoss-ui/src/utils/util.js';
+export default {
+  name: 'Circulate',
+  components: {
+    [CommonOpinions.name]: CommonOpinions,
+    [SelectUser.name]: SelectUser
+  },
+  props: {
+    pendingId: { type: String, default: '' },
+    processDefinitionId: { type: String, default: '' },
+    businessId: { type: String, default: '' },
+    type: { type: String, 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,
+  data() {
+    return {
+      opinion: '', //办理意见
+      readOnlyNotificationType: '',
+      notificationMessageReadOnly: false,
+      otherMix: false,
+      currentMix: false,
+      infoList: {
+        nextOtherOrgObj: [],
+        nextCurrentOrgObj: [],
+        noticeType: [],
+        noticeInfo: '',
+        opinion: ''
+      },
+      onlyName: '',
+      currentOrgTabs: [],
+      foreignOrgTabs: [],
+      currentOrgProcessKey: '',
+      isSubFlow: true,
+      choiceDeptId: '',
+      choiceOrgId: '',
+      isSinglePage: false,
+      isChoiceOtherOrgDept: '',
+      currentOrgName: '',
+      otherOrgName: '',
+      newMultiple: true,
+      params: { filid: 'all' },
+      isHideOtherOrg: '',
+      isHideCurrentOrg: 0,
+      isOpinionRequired: 0,
+      otherParams: { filid: 'other' },
+      loading: false
+    };
+  },
+  mounted() {
+    this.loading = true;
+    this.newMultiple = this.multiple;
+    this.opinion = this.oldOption;
+    this.getNodeType();
+    // this.getFind();
+    this.getMessage();
+  },
+  methods: {
+    isMultiple(val) {
+      if (val == 7 || val == 9 || val == 11) {
+        this.newMultiple = false;
+      }
+    },
+    subMit() {
+     
+      let {
+        infoList: {
+          nextCurrentOrgObj,
+          nextOtherOrgObj,
+          noticeType,
+          noticeInfo
+        },
+        processDefinitionId,
+        opinion,
+        businessId,
+      } = this;
+      if (
+        (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0)&&
+        (!nextOtherOrgObj || nextOtherOrgObj.length == 0)
+      ) {
+        return this.$message.warning('请选择处理对象!');
+      } 
+     
+      const param = {
+        url: directStartTaskCircularRead,
+        data: {
+          opinion,
+          businessId,
+          processDefinitionId,
+          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
+            ? nextOtherOrgObj.join(',')
+            : nextOtherOrgObj,
+          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
+            ? nextCurrentOrgObj.join(',')
+            : nextCurrentOrgObj,
+          notificationMsg: noticeInfo,
+          notificationType: noticeType.join(','),
+          userId:JSON.parse(util.getStorage('mainConfig')).userModel.userId,
+        },
+        headers: { Accept: 'application/json,text/plain' },
+        method: 'POST'
+      };
+      this.loading = true;
+      util
+        .ajax(param)
+        .then((res) => {
+          const { message, status,rCode } = res;
+          this.loading = false;
+          if (status == 'success' || rCode == 0) {
+            this.simpleTips && this.$message.success('提交成功');
+            this.quit(true);
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    quit(val) {
+      if (val === true) return this.$emit('cancel', val);
+      this.$emit('cancel');
+    },
+    changeSelectUser(val, type) {
+      const { nextUser, options } = val;
+      let newNextUser = [];
+      let obj = {};
+      options.map((item) => {
+        if (obj[item.stype]) {
+          obj[item.stype].push(item.id);
+        } else {
+          obj[item.stype] = [item.id];
+        }
+        // if (newNextUser) {
+        //   newNextUser += `,${item.stype}-${item.id}`;
+        // } else {
+        //   newNextUser = `${item.stype}-${item.id}`;
+        // }
+      });
+      for (let key in obj) {
+        newNextUser.push(`${key}-${obj[key].join(',')}`);
+      }
+
+      this.infoList[type] = newNextUser.join('|');
+    },
+    getNodeType() {
+      util
+        .ajax({
+          url: findCodeValues,
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
+        })
+        .then((res) => {
+          const { status, data } = res;
+          this.loading = false;
+          if (status === 'success') {
+            this.infoList.noticeList = data;
+            this.getFind()
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    //获取通知信息
+    getMessage() {
+      let params = {
+        pendingId: this.pendingId
+      };
+      util
+        .ajax({ url: getNotificationMsg, params, methods: 'post' })
+        .then((res) => {
+          if (res.status === 'success') {
+            this.infoList.noticeInfo = res.message;
+          }
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    getFind() {
+      util
+        .ajax({
+          url: findSysCodes
+        })
+        .then((res) => {
+          const { status, message } = res;
+          if (status === 'success') {
+            this.infoList.noticeType = message.split(',');
+            let arr = [];
+            this.infoList.noticeList.map((item) => {
+              this.infoList.noticeType.map((x) => {
+                if (x == item.cciValue) {
+                  arr.push(x);
+                }
+              });
+            });
+            this.infoList.noticeType = arr;
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    }
+  }
+};
+</script>
+
+<style></style>

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 || '系统错误，请联系管理员！');