eoss-ui 0.6.68 → 0.6.70

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

@@ -65,6 +65,7 @@
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
           :mix="otherMix"
+          :disableds="otherOrgDisabledObjId"
           :types="
             foreignOrgTabs.length > 0
               ? foreignOrgTabs
@@ -184,6 +185,7 @@ export default {
       foreignOrgTabsParam: {},
       currentOrgTabsParam: {},
       currentOrgProcessKey: '',
+      otherOrgDisabledObjId:[],
       isSubFlow: true,
       choiceDeptId: '',
       choiceOrgId: '',
@@ -321,6 +323,7 @@ export default {
                 readOnlyNotificationType,
                 notificationMessageReadOnly,
                 unionDispatchOrgId,
+                otherOrgDisabledObjId,
                 orgNames,
                 nodeInfoMap: {
                   nodeExtAttr: {
@@ -332,6 +335,11 @@ export default {
                 }
               }
             } = res;
+            console.log(otherOrgDisabledObjId,'otherOrgDisabledObjId')
+            if(otherOrgDisabledObjId){
+              this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',')
+              console.log( this.otherOrgDisabledObjId,otherOrgDisabledObjId.split(','))
+            }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
                 this.currentMix =

package/packages/flow/src/main.vue

@@ -6,6 +6,34 @@
     v-if="!shrinkAbled"
   >
     <div v-if="showCirculate">
+      <div class="es-flow-top">
+        <div class="es-flow-title">
+          <span v-show="!shrink"
+            >当前节点：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
+          >
+          <es-button
+            v-if="showShrink"
+            size="medium"
+            class="es-icon"
+            :icon="shrink ? 'es-icon-indent' : 'es-icon-increase'"
+            @click="setShrink"
+          ></es-button>
+        </div>
+        <div class="es-opinion" v-show="!shrink">
+          <span class="es-eidt-title" :style="`${!isFlow ? 'color:red' : ''}`"
+            >填写意见</span
+          >
+          <!-- <span
+            v-show="!isFlow && newTypeCode != 'fenyue'"
+            class="es-opinion-file"
+            @click="showFileList = true"
+            ><i class="es-icon-fujian"></i>意见附件<span
+              class="es-file-num"
+              v-show="fileNum > 0"
+              >({{ fileNum }})</span
+            ></span> -->
+        </div>
+      </div>
       <CommonOpinions
         class="es-common-opinions"
         v-show="!shrink"
@@ -18,10 +46,11 @@
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
       <el-form ref="form" :model="circulateForm" label-width="120px">
-        <el-form-item prop="nextNodeId" label="下步节点">
+        <el-form-item style="margin-top:20px" prop="nextNodeId" label="下步节点">
           <el-select
             v-if="nextNodeCheckType == 'select'"
             v-model="circulateForm.nextNodeId"
+            style="width: 100% !important;"
             :placeholder="`请选择下步节点`"
           >
             <el-option label="传阅" value="111"></el-option>
@@ -37,7 +66,7 @@
       </el-form>
       <circulate
         style="margin-top: 10px"
-        :businessId="businessId"
+        :businessId="businessIds"
         ref="circulate"
         :selectorParams="params"
         :pending-id="pendingId"
@@ -312,6 +341,7 @@
                 ]"
               >
                 <el-select
+                v-if="nextOperateCheckType == 'select'"
                   v-model="nextNode.nextOperate"
                   :placeholder="`请选择下步操作`"
                   :disabled="operationList && operationList.length == 1"
@@ -324,6 +354,14 @@
                     :value="items.key"
                   ></el-option>
                 </el-select>
+                <es-radio-group
+                    v-else-if="nextOperateCheckType == 'radio'"
+                    v-model="nextNode.nextOperate"
+                    :data="operationList"
+                     @change="selecNext($event, true)"
+                    value-key="key"
+                    label-key="value"
+                  ></es-radio-group>
               </el-form-item>
               <div>
                 <el-form-item
@@ -1067,6 +1105,7 @@ export default {
       showCustomLimitTimeText: false,
       currentOrgDisabledObjId: [],
       nextNodeCheckType: 'select',
+      nextOperateCheckType:'select',
       readOnlyNotificationType: '',
       circularReadParamsMap: { circularReadOrgRoleCode: '' },
       taskParams: {},
@@ -2589,6 +2628,7 @@ export default {
                 circularReadParamsMap,
                 isPreset,
                 choiceOrgId,
+                nextOperateCheckType,
                 choiceDeptId,
                 readOnlyNotificationType,
                 notificationMessageReadOnly,
@@ -2618,7 +2658,8 @@ export default {
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
             this.circularReadParamsMap = circularReadParamsMap || {};
-            this.currentOrgName = currentOrgName;
+            this.currentOrgName = 
+            this.nextOperateCheckType = nextOperateCheckType;
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
             this.readOnlyNotificationType = readOnlyNotificationType;
@@ -2861,6 +2902,8 @@ export default {
       ) {
         this.flowSuccess(true);
         // this.$emit('success');
+      }else{
+        this.$emit('cancel')
       }
     },
     /**

package/packages/flow/src/selectUser.vue

@@ -74,6 +74,7 @@
             ? ''
             : 'no-icon'
         "
+        :where="newWhere"
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
@@ -183,6 +184,11 @@ export default {
       newRadioList: []
     };
   },
+  computed:{
+    newWhere(){
+      return {mid:`${JSON.parse(util.getStorage('mainConfig')).userModel.orgId}-org-1`,...this.where}
+    }
+  },
   watch: {
     newPresetEdit(val) {
       this.isChange = false;

package/packages/login/src/main.vue

@@ -18,6 +18,7 @@
     </div>
     <img v-if="loginLogoImg" class="es-login-logo" :src="loginLogoImg" />
     <slot></slot>
+    <slot name="warning" :contents="warningText"></slot>
     <div
       class="es-login"
       v-loading.fullscreen.lock="submit"
@@ -49,28 +50,28 @@
             'es-login-model': modelLength == 2 || mode == 'complex'
           }"
         >
-          <template
-            v-if="this.mode == 'complex' && loginModel.indexOf('3') > -1"
-          >
-            <template v-for="item in switchs">
-              <div
-                v-if="item.tips"
-                v-show="switchActive != item.type"
-                class="es-login-model-tips"
-                :key="item.type + '_0'"
-                :style="getBackground(item.background)"
-              >
-                {{ item.tips }}
-              </div>
-              <span
-                v-show="switchActive != item.type"
-                class="es-icon-box"
-                @click="switchLoginType(item)"
-                :title="modelLength > 2 ? item.name : ''"
-                :key="item.type + '_1'"
-              >
-                <i :class="[item.icon, 'es-icon']"></i>
-              </span>
+          <template v-if="this.mode == 'complex'">
+            <template v-if="loginModel.indexOf('3') > -1">
+              <template v-for="item in switchs">
+                <div
+                  v-if="item.tips"
+                  v-show="switchActive != item.type"
+                  class="es-login-model-tips"
+                  :key="item.type + '_0'"
+                  :style="getBackground(item.background)"
+                >
+                  {{ item.tips }}
+                </div>
+                <span
+                  v-show="switchActive != item.type"
+                  class="es-icon-box"
+                  @click="switchLoginType(item)"
+                  :title="modelLength > 2 ? item.name : ''"
+                  :key="item.type + '_1'"
+                >
+                  <i :class="[item.icon, 'es-icon']"></i>
+                </span>
+              </template>
             </template>
           </template>
           <template v-else>
@@ -391,8 +392,8 @@
               >初次使用请下载一键安装包</span
             >
           </div>
-          <div class="es-warning" v-if="warnInfo">
-            {{ warnInfo }}
+          <div class="es-warning" v-if="showWarnInfo">
+            {{ warningText }}
           </div>
         </div>
       </div>
@@ -492,7 +493,7 @@
     </es-dialog>
     <transition name="launch-fade">
       <div class="es-launch-image" :style="_launchImage" v-show="showLaunch">
-        <p class="es-launch-text es-launch-user-name">{{ userName }}，你好！</p>
+        <p class="es-launch-text es-launch-user-name">{{ userName }}，您好！</p>
         <p class="es-launch-text es-launch-system-name">
           欢迎进入{{ sysName }}
         </p>
@@ -501,6 +502,8 @@
     <es-ca-login
       v-if="isCaLogin"
       ref="calogin"
+      :showSelect="showKeySelect"
+      :install-path="installPath"
       :ca-model="caLoginModel"
       :identifyingId="identifyingId"
       :success="caLogin"
@@ -711,10 +714,7 @@ export default {
       default: true
     },
     storage: String,
-    warning: {
-      type: [Boolean, String],
-      default: false
-    },
+    warning: String,
     copyrightStyle: {
       type: Object,
       default() {
@@ -775,7 +775,9 @@ export default {
         return [];
       }
     },
-    caModel: String
+    caModel: String,
+    caInstallPath: String,
+    showKeySelect: Boolean
   },
   computed: {
     transform() {
@@ -818,21 +820,12 @@ export default {
         return window.location.href || window.href;
       }
     },
-    warnInfo() {
-      if (this.warning === false && !this.warningText) {
-        return false;
-      }
-      if (
-        this.warningText &&
-        this.warningText !== 'true' &&
-        this.warningText !== true
-      ) {
-        return this.warningText;
-      }
-      if (this.warning && typeof this.warning === 'string') {
-        return this.warning;
-      }
-      return '本系统为非涉密系统，禁止上传和处理任何涉密文件';
+    showWarnInfo() {
+      return this.$slots.warning || this.$scopedSlots.warning
+        ? false
+        : this.warningText
+        ? true
+        : false;
     },
     modelLength() {
       return Array.isArray(this.loginModel)
@@ -883,7 +876,6 @@ export default {
       types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
-      console.log(icon);
       return icon;
     },
     isCaLogin() {
@@ -1017,7 +1009,7 @@ export default {
       checkCode: '',
       showAssistance: false,
       doAssistance: null,
-      warningText: '',
+      warningText: this.warning,
       safes: {
         paste: (event) => {
           event.preventDefault();
@@ -1043,7 +1035,8 @@ export default {
       launchKey: 'day',
       launchTime: 2000,
       switchActive: this.switchsActive,
-      loginDownloadApp: this.loginDownloadApps
+      loginDownloadApp: this.loginDownloadApps,
+      installPath: this.caInstallPath
     };
   },
   beforeCreate() {
@@ -1478,6 +1471,9 @@ export default {
         if (res.subsystemExtend.loginDownloadApp) {
           this.loginDownloadApp = res.subsystemExtend.loginDownloadApp;
         }
+        if (res.subsystemExtend.caInstallPath) {
+          this.installPath = res.subsystemExtend.caInstallPath;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;

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

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

package/packages/selector/src/main.vue

@@ -224,7 +224,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util.js';
-import { getSelectorOrgDetail } from 'eoss-ui/src/config/api.js';
+import { getSelectorOrgDetail, getSysParam } from 'eoss-ui/src/config/api.js';
 import Clickoutside from 'eoss-element/src/utils/clickoutside';
 export default {
   name: 'EsSelector',
@@ -458,10 +458,16 @@ export default {
         clearTimeout(this.timer);
         this.timer = setTimeout(this.handleSearch, 500);
       }
+    },
+    mix(val) {
+      if (val) {
+        this.getSysParam();
+      }
     }
   },
   created() {
     this.reference = this.$refs.esSelector;
+    this.mix && this.getSysParam();
   },
   mounted() {
     this.resetInputHeight();
@@ -478,6 +484,25 @@ export default {
     }
   },
   methods: {
+    getSysParam() {
+      if (util.getStorage('sysorgname') && util.getStorage('sysdepname')) {
+        return;
+      }
+      util
+        .ajax({
+          url: getSysParam,
+          params: {
+            paramCode: 'sysorgname,sysdepname'
+          }
+        })
+        .then((res) => {
+          if (res.rCode === 0) {
+            let params = res.results.split(',');
+            sessionStorage.setItem('sysorgname', params[0]);
+            sessionStorage.setItem('sysdepname', params[1]);
+          }
+        });
+    },
     isObject(obj) {
       return util.isObject(obj);
     },
@@ -598,13 +623,14 @@ export default {
     },
     handleConfirm(res) {
       this.visible = false;
-      if (util.isObject(res)) {
-        this.$emit('input', [res]);
-        this.$emit('confirm', [res], this.businessData);
-      } else {
-        this.$emit('input', res);
-        this.$emit('confirm', res, this.businessData);
+      let val = util.isObject(res) ? [res] : res;
+      if (this.mix) {
+        val.forEach((item, index) => {
+          val[index]._typeName = util.getTypeName(item.stype);
+        });
       }
+      this.$emit('input', val);
+      this.$emit('confirm', val, this.businessData);
       let inputChildNodes = this.$refs.reference
         ? this.$refs.reference.$el.childNodes
         : null;

package/packages/selector-panel/src/main.vue

@@ -340,7 +340,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 2,
+            showarea: 0,
             id: 0,
             filid: 'all'
           }
@@ -368,7 +368,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 2,
+            showarea: 0,
             id: 0,
             filid: 'all'
           }
@@ -396,7 +396,7 @@ export default {
           name: 'filgroup',
           url: getSelectorOrgTree,
           param: {
-            showarea: 3,
+            showarea: 4,
             id: 0,
             filid: 'all'
           }
@@ -410,7 +410,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 4,
+            showarea: 5,
             id: 0,
             filid: 'all'
           }
@@ -452,7 +452,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 13,
+            showarea: 14,
             id: 0,
             filid: 'all'
           }

package/packages/selector-panel/src/selection.vue

@@ -141,16 +141,9 @@ export default {
   },
   methods: {
     getLabel(res) {
-      let tag = '';
-      if (this.mix) {
-        tag = util.getTypeName(res.stype);
-      }
-      return (
-        tag +
-        (res[this.labelKey]
-          ? res[this.labelKey]
-          : res.label || res[this.valueKey])
-      );
+      return res[this.labelKey]
+        ? res[this.labelKey]
+        : res.label || res[this.valueKey];
     },
     handleSort(res) {
       this.$emit('sort', res);