eoss-ui 0.6.63 → 0.6.65

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

@@ -74,7 +74,7 @@
         <!-- <span>{{ infoList.noticeInfo }}</span> -->
       </el-form-item>
     </el-form>
-    <div style="text-align: right">
+    <div v-if="showBtn" style="text-align: right">
       <el-button type="primary" size="small" @click="subMit"> 确定 </el-button>
       <el-button @click="quit" size="small"> 取消 </el-button>
     </div>
@@ -106,6 +106,7 @@ export default {
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
+    showBtn: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true }
   },
   inheritAttrs: false,
@@ -143,6 +144,15 @@ export default {
       loading: false
     };
   },
+  watch:{
+    oldOption:{
+      handler(val) {
+        this.opinion = val;
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;

package/packages/flow/src/main.vue

@@ -5,8 +5,56 @@
     :style="styles"
     v-if="!shrinkAbled"
   >
+    <div v-if="showCirculate">
+      <CommonOpinions
+        class="es-common-opinions"
+        v-show="!shrink"
+        ref="commonOpinions"
+        @change="(val) => (value = val)"
+        :opinion="value"
+        :rows="rows"
+        :required="isOpinionRequired == 1"
+        :isBanInputOpinion="isBanInputOpinion"
+        :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
+      />
+      <el-form ref="form" :model="circulateForm" label-width="120px">
+        <el-form-item prop="nextNodeId" label="下步节点">
+          <el-select
+            v-if="nextNodeCheckType == 'select'"
+            v-model="circulateForm.nextNodeId"
+            :placeholder="`请选择下步节点`"
+          >
+            <el-option label="传阅" value="111"></el-option>
+          </el-select>
+          <es-radio-group
+            v-else-if="nextNodeCheckType == 'radio'"
+            v-model="circulateForm.nextNodeId"
+            :data="[{ nodeId: '111', nodeName: '传阅' }]"
+            value-key="nodeId"
+            label-key="nodeName"
+          ></es-radio-group>
+        </el-form-item>
+      </el-form>
+      <circulate
+        style="margin-top: 10px"
+        :businessId="businessId"
+        ref="circulate"
+        :showBtn="false"
+        :processDefinitionId="nodeInfo.nextNode"
+        :simpleTips="simpleTips"
+        :oldOption="value"
+        @cancel="closeProcess($event, 'circulateVisible')"
+      />
+      <el-button
+        type="primary"
+        style="width: 100%"
+        @click="handleClickCirculate()"
+      >
+        提交
+      </el-button>
+    </div>
     <StartTaskRead
-      v-if="typeCode == 'read'"
+      v-else-if="typeCode == 'read'"
       :pending-id="pendingId"
       :opinion="value"
       type="create"
@@ -146,12 +194,14 @@
                 v-model="nodeInfo.nextNode"
                 style="width: calc(100% + 40px)"
                 :placeholder="`请选择流程`"
+                :key="optionsKey"
                 @change="handleChange"
               >
                 <el-option
                   v-for="items in nodeInfo.option"
                   :key="items.id"
                   :label="items.name"
+                  :disabled="items.disabled"
                   :value="items.processDefId"
                 ></el-option>
               </el-select>
@@ -929,7 +979,6 @@ import {
   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',
@@ -960,7 +1009,7 @@ export default {
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
-
+    isCirculate: { type: Boolean, default: false },
     btnList: {
       type: Array,
       default: () => [
@@ -996,6 +1045,9 @@ export default {
   data() {
     return {
       styles: {},
+      optionsKey: 0,
+      showCirculate: false,
+      circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
       showFreeStartFlow: false, //自由发起流程弹窗
@@ -1182,22 +1234,19 @@ export default {
   mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
-    this.getNodeType();
-    !this.isFlow &&
-      (this.newTypeCode = this.typeCode || this.$route.query.typecode);
-    if (this.isFlow) {
-      this.businessId && this.getProcess();
-    } else if (this.newTypeCode == 'fenyue') {
-      this.getTaskReadFlow();
-    } else if (
-      this.newTypeCode != 'reset' &&
-      this.newTypeCode != 'continuation'
-    ) {
-      this.getHedInfo();
-    }
+    this.getInfo();
   },
   watch: {
+    isCirculate: {
+      handler(val) {
+        this.showCirculate = val;
+        if (!val) {
+          this.getInfo();
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     width: {
       immediate: true,
       handler(val) {
@@ -1287,6 +1336,25 @@ export default {
     }
   },
   methods: {
+    getInfo() {
+      if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
+      this.getNodeType();
+      !this.isFlow &&
+        (this.newTypeCode = this.typeCode || this.$route.query.typecode);
+      if (this.isFlow) {
+        this.businessId && this.getProcess();
+      } else if (this.newTypeCode == 'fenyue') {
+        this.getTaskReadFlow();
+      } else if (
+        this.newTypeCode != 'reset' &&
+        this.newTypeCode != 'continuation'
+      ) {
+        this.getHedInfo();
+      }
+    },
+    handleClickCirculate() {
+      this.$refs.circulate.subMit();
+    },
     getNodeInfoForStartFlow(processDefinitionId) {
       let params = {
         url: getNodeInfoForStart,
@@ -1297,6 +1365,18 @@ export default {
           this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           this.directCreateCircularReadWhenFlowStarted =
             res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
+
+         
+          if (this.directCreateCircularReadWhenFlowStarted) {
+            this.nodeInfo.option.map((item) => {
+              item.disabled = item.processDefId != processDefinitionId;
+            });
+          } else {
+            this.nodeInfo.option.map((item) => {
+              item.disabled = false;
+            });
+          }
+          this.optionsKey++;
           this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
         }
       });
@@ -1565,7 +1645,7 @@ export default {
             this.taskExamineInfo = taskExamine;
             this.nodeName = this.nodename || taskExamine.nodeName || '分阅';
             this.taskReadOpinionRequired = taskReadOpinionRequired;
-            this.nextNode.notificationMsg = defaultNotificationMessage
+            this.nextNode.notificationMsg = defaultNotificationMessage;
             this.isCanReadTransferHandle = isCanReadTransferHandle;
             this.isCanFenyue = isCanFenyue;
             if (this.nodeName) {
@@ -2302,7 +2382,10 @@ export default {
               this.presetEdit = data.nodeExtAttr.presetEdit;
               this.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
               this.handleMode = data.countersignaturetypeText;
-              data.globalNodeType === 'endEvent' ? (this.endFlow = true) : '';
+              if (data.globalNodeType === 'endEvent') {
+                this.isNextUser = data.globalNodeType != 'endEvent';
+                data.globalNodeType === 'endEvent' ? (this.endFlow = true) : '';
+              }
             }
             this.isCustomPreset &&
               this.$refs.customPreset.getPresetFlowInfo(
@@ -2344,6 +2427,7 @@ export default {
         this.isShowNode = false;
         this.isMainSubProcess = false;
         this.isNodeShowProcess = false;
+        this.endFlow = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;

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

@@ -24,7 +24,7 @@
           v-if="show"
           :class="{ 'es-flow-group-data-table': item.type !== 'sign' }"
           :display="display"
-          number
+          :numbers="numbers"
           @cell-click="handleCellClick"
           :full="height !== 'auto'"
           v-bind="item"
@@ -125,7 +125,7 @@ export default {
       type: String,
       default: ''
     },
-    hideBtn:{
+    hideBtn: {
       type: Boolean,
       default: false
     },
@@ -149,11 +149,18 @@ export default {
         return ['flow', 'splitReading', 'preset'];
       }
     },
+    numbers: {
+      type: Boolean,
+      default: false
+    },
     height: {
       type: String,
       default: ''
     },
-
+    showDoresult: {
+      type: Boolean,
+      default: false
+    },
     theadWidth: {
       type: Object,
       default: () => {
@@ -577,7 +584,7 @@ export default {
             type: 'handle',
             width: this.modify ? '130' : '100',
             template: '',
-            hide:this.hideBtn,
+            hide: this.hideBtn,
             events: [
               {
                 text: '删除',
@@ -753,7 +760,7 @@ export default {
             type: 'handle',
             width: '100',
             template: '',
-            hide:this.hideBtn,
+            hide: this.hideBtn,
             events: [
               {
                 text: '删除',
@@ -1293,6 +1300,11 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success' || res.rCode == 0) {
+          if (this.showDoresult && res.data.fyHistoryList) {
+            res.data.fyHistoryList = res.data.fyHistoryList.filter(
+              (x) => x.doresult || x.handleInfo
+            );
+          }
           _that.circularData = res.data.fyHistoryList;
           _that.hasCircularReadWithdrawAuthority =
             res.data.hasCircularReadWithdrawAuthority;
@@ -1503,6 +1515,9 @@ export default {
         }
       };
       await util.ajax(params).then((res) => {
+        if (this.showDoresult && res.data) {
+          res.data = res.data.filter((x) => x.doresult || x.handleInfo);
+        }
         if (type == 1) {
           this.untreatedReadData = res.data;
         } else {
@@ -1530,7 +1545,7 @@ export default {
       util
         .ajax(params)
         .then((res) => {
-          const {
+          let {
             status,
             message,
             data: {
@@ -1545,6 +1560,16 @@ export default {
           } = res;
           this.loading.close();
           if (status == 'success') {
+            if (this.showDoresult) {
+              wfHistoryList &&
+                (wfHistoryList = wfHistoryList.filter(
+                  (x) => x.doresult || x.handleInfo
+                ));
+              fyHistoryList &&
+                (fyHistoryList = fyHistoryList.filter(
+                  (x) => x.doresult || x.handleInfo
+                ));
+            }
             this.flowTableInfo.adjunctCode = adjunctCode;
             this.flowTableInfo.hasAgent = hasAgent;
             this.attachmentPaperClipCssStyle =
@@ -1686,7 +1711,7 @@ export default {
       util
         .ajax(param)
         .then((res) => {
-          const {
+          let {
             status,
             message,
             data: {
@@ -1698,6 +1723,11 @@ export default {
           } = res;
           this.loading.close();
           if (status == 'success') {
+            if (this.showDoresult && presetInfoList) {
+              presetInfoList = presetInfoList.filter(
+                (x) => x.doresult || x.handleInfo
+              );
+            }
             presetInfoList && (this.presetData = presetInfoList);
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
             this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;

package/packages/form/src/main.vue

@@ -3492,12 +3492,10 @@ export default {
         } else {
           for (let i in this.within) {
             let names = this.within[i];
-            let itemData;
+            let itemData = {};
             if (Array.isArray(names)) {
-              itemData = names.map((item) => {
-                let val = obj[item];
-                delete obj[item];
-                return val;
+              names.forEach((item) => {
+                itemData[item] = obj[item];
               });
             }
             newData[i] = itemData;

package/packages/login/src/main.vue

@@ -119,7 +119,7 @@
             <template v-else>
               <template v-for="item in icons">
                 <div
-                  v-if="item.type !== '3'"
+                  v-if="item.type !== '3' && item.type !== '1'"
                   class="es-login-complex-models-item"
                   :class="{ 'es-active': active == item.type }"
                   :key="item.type"
@@ -396,18 +396,58 @@
         </div>
       </div>
     </div>
-    <div v-if="icp && icpInfo" class="es-login-icp">
-      <span class="es-login-icp-item" :style="_copyrightStyle">{{
-        icpInfo.copyright_unit
-      }}</span>
-      <a
-        class="es-login-icp-item"
-        target="_blank"
-        :style="_copyrightStyle"
-        :href="icpInfo.copyright_icp_url"
-        >{{ icpInfo.copyright_icp }}</a
-      >
-    </div>
+    <slot name="footer" :copyright="copyright">
+      <div class="es-login-icp">
+        <template v-for="item in copyright">
+          <a
+            v-if="item.url || item.open"
+            class="es-login-icp-item"
+            :target="item.open ? '_blank' : '_self'"
+            :style="{
+              color: '#63c2ff',
+              ...item.style
+            }"
+            :key="item.title"
+            :href="item.url || item.open"
+          >
+            {{ item.title }}
+          </a>
+          <span
+            v-else
+            class="es-login-icp-item"
+            :style="item.style || copyrightStyle"
+            :key="item.title"
+          >
+            {{ item.title }}
+          </span>
+          <template v-if="item.children && item.children.length">
+            <template v-for="child in item.children">
+              <a
+                v-if="child.url || child.open"
+                class="es-login-icp-child-item"
+                :target="child.open ? '_blank' : '_self'"
+                :style="{
+                  color: '#63c2ff',
+                  ...child.style
+                }"
+                :key="child.title"
+                :href="child.url || child.open"
+              >
+                {{ child.title }}
+              </a>
+              <span
+                v-else
+                class="es-login-icp-child-item"
+                :style="child.style || copyrightStyle"
+                :key="child.title"
+              >
+                {{ child.title }}
+              </span>
+            </template>
+          </template>
+        </template>
+      </div>
+    </slot>
     <es-dialog
       :title="operationCheckCode ? '修改密码' : '密码重置'"
       width="680px"
@@ -439,7 +479,6 @@
     >
       <es-clients :downloads="download" :showTips="showIosTips"></es-clients>
     </es-dialog>
-    <slot name="calogin"></slot>
     <es-dialog
       title="请进行身份效验"
       width="420px"
@@ -458,6 +497,12 @@
         </p>
       </div>
     </transition>
+    <es-ca-login
+      v-if="isCaLogin"
+      ref="calogin"
+      :identifyingId="identifyingId"
+      :success="caLogin"
+    ></es-ca-login>
   </div>
 </template>
 <script>
@@ -667,14 +712,12 @@ export default {
       type: [Boolean, String],
       default: false
     },
-    icp: {
-      type: Boolean,
-      default: true
-    },
     copyrightStyle: {
       type: Object,
       default() {
-        return { color: '#ffffff' };
+        return {
+          color: '#fff'
+        };
       }
     },
     appName: String,
@@ -722,7 +765,13 @@ export default {
         };
       }
     },
-    loginDownloadApps: Boolean
+    loginDownloadApps: Boolean,
+    copyrights: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   computed: {
     transform() {
@@ -832,12 +881,8 @@ export default {
       });
       return icon;
     },
-    _copyrightStyle() {
-      let style = {};
-      this.copyrightBgColor &&
-        (style['background-color'] = this.copyrightBgColor);
-      this.copyrightColor && (style['color'] = this.copyrightColor);
-      return { ...this.copyrightStyle, ...style };
+    isCaLogin() {
+      return this.loginModel.indexOf('1') > -1;
     },
     showVerifyCode() {
       return (
@@ -937,11 +982,11 @@ export default {
       users: [],
       imageCode: '',
       secret: null,
-      identifyingId: '',
+      identifyingId: undefined,
       download: {},
       setup: '',
       sysName: '',
-      icpInfo: '',
+      copyright: this.copyrights,
       forgetUrl: this.forget,
       actionUrl: this.action,
       downloadSetup: '',
@@ -963,8 +1008,6 @@ export default {
       countdown: 0,
       code: null,
       defaultModel: JSON.parse(JSON.stringify(this.model)),
-      copyrightColor: null,
-      copyrightBgColor: null,
       checkCode: '',
       showAssistance: false,
       doAssistance: null,
@@ -1197,18 +1240,20 @@ export default {
       }
     },
     switchLogin(res) {
-      if (res != 1) {
+      if (res.type != '1') {
         this.active = res.type;
         this.title = res.name;
         Object.keys(this.defaultModel).length &&
           (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
+        this.$emit('change-type', res, this.identifyingId);
+        this.$nextTick(() => {
+          let ref = 'login' + this.active;
+          this.$refs[ref] && this.$refs[ref].clearValidate();
+        });
+      } else {
+        this.$refs.calogin && this.$refs.calogin.getCertificate();
       }
       this.countdown = 0;
-      this.$emit('change-type', res, this.identifyingId);
-      this.$nextTick(() => {
-        let ref = 'login' + this.active;
-        this.$refs[ref] && this.$refs[ref].clearValidate();
-      });
     },
     switchLoginType(res) {
       this.countdown = 0;
@@ -1324,7 +1369,12 @@ export default {
       }
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
-        this.icpInfo = res.subsystemExtend;
+        if (
+          res.subsystemExtend.copyright &&
+          res.subsystemExtend.copyright.length
+        ) {
+          this.copyright = JSON.parse(res.subsystemExtend.copyright);
+        }
         if (res.subsystemExtend.qrimg || res.subsystemExtend.qrImg) {
           this.qrimg = res.subsystemExtend.qrimg || res.subsystemExtend.qrImg;
         }
@@ -1370,12 +1420,6 @@ export default {
           );
           this.align = res.subsystemExtend.loginBoxAlign;
         }
-        if (res.subsystemExtend.copyrightColor) {
-          this.copyrightColor = res.subsystemExtend.copyrightColor;
-        }
-        if (res.subsystemExtend.copyrightBackgroundColor) {
-          this.copyrightBgColor = res.subsystemExtend.copyrightBackgroundColor;
-        }
         if (res.subsystemExtend.themeColor) {
           util.updateTheme(res.subsystemExtend.themeColor);
           localStorage.setItem('theme', res.subsystemExtend.themeColor);
@@ -1649,6 +1693,7 @@ export default {
         });
     },
     caLogin(signedData) {
+      this.loginInfo(false);
       util
         .ajax({
           method: 'post',
@@ -1672,6 +1717,7 @@ export default {
               duration: 1500,
               onClose: () => {
                 this.getImgCode();
+                this.loginInfo(this.active == 3);
               }
             });
             this.onError(res);

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

@@ -56,6 +56,7 @@ export default {
   computed: {
     //用户头像
     _userHead() {
+      console.log(this.user);
       return this.userHead ? this.userHead : this.user.userHeadUrl;
     }
   },

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

@@ -24,9 +24,11 @@
           @change="handleChangeConfig"
           @close="handlerClose"
         ></user>
-        <avatar slot="reference" :user="user" :size="56"> </avatar>
+        <avatar slot="reference" :user="user" :size="56" :show-name="true">
+        </avatar>
         <!-- 用户信息 end -->
       </el-popover>
+      <div class="es-simplicity-username">{{ user.username }}</div>
       <div class="es-simplicity-side-Application">
         <!-- 常用应用 -->
         <el-scrollbar>