eoss-ui 0.6.66 → 0.6.68

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

@@ -28,7 +28,7 @@
           @cell-click="handleCellClick"
           :full="height !== 'auto'"
           v-bind="item"
-          :data="returnData(item.type)"
+          :data="showDoresult?returnData(item.type).filter(x => x.doresult || x.handleInfo) : returnData(item.type)"
           @btn-click="handleBtnClick"
           @selection-change="handleSelectionChange"
         ></es-data-table>
@@ -1300,11 +1300,7 @@ 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;
@@ -1318,24 +1314,31 @@ export default {
       switch (type) {
         case 'preset':
           this.flowListCount.preset = this.presetData.length;
+          this.flowListCount.presetData = this.presetData;
           return this.presetData;
         case 'sign':
           this.flowListCount.sign = this.signData.length;
+          this.flowListCount.signData = this.signData;
           return this.signData;
         case 'splitReading':
           this.flowListCount.splitReading = this.splitReadingData.length;
+          this.flowListCount.splitReadingData = this.splitReadingData;
           return this.splitReadingData;
         case 'circular':
           this.flowListCount.circular = this.circularData.length;
+          this.flowListCount.circularData = this.circularData;
           return this.circularData;
         case 'untreatedRead':
           this.flowListCount.untreatedRead = this.untreatedReadData.length;
+          this.flowListCount.untreatedReadData = this.untreatedReadData;
           return this.untreatedReadData;
         case 'processedRead':
           this.flowListCount.processedRead = this.processedReadData.length;
+          this.flowListCount.processedReadData = this.processedReadData;
           return this.processedReadData;
         default:
           this.flowListCount.flow = this.flowData.length;
+          this.flowListCount.flowData = this.flowData;
           return this.flowData;
       }
     },
@@ -1515,9 +1518,7 @@ 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 {
@@ -1560,16 +1561,7 @@ 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 =
@@ -1723,11 +1715,7 @@ 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/login/src/main.vue

@@ -77,7 +77,8 @@
             <template v-for="item in icons">
               <div
                 class="es-login-model-item-tips"
-                v-show="modelLength == 2 && active != item.type && modelTips"
+                v-if="modelLength == 2"
+                v-show="active != item.type && modelTips"
                 :key="item.type"
               >
                 {{ item.name }}点这里<i class="es-icon-zhixiangyou"></i>
@@ -119,7 +120,7 @@
             <template v-else>
               <template v-for="item in icons">
                 <div
-                  v-if="item.type !== '3' && item.type !== '1'"
+                  v-if="item.type !== '3'"
                   class="es-login-complex-models-item"
                   :class="{ 'es-active': active == item.type }"
                   :key="item.type"
@@ -500,8 +501,10 @@
     <es-ca-login
       v-if="isCaLogin"
       ref="calogin"
+      :ca-model="caLoginModel"
       :identifyingId="identifyingId"
       :success="caLogin"
+      @error="handleError"
     ></es-ca-login>
   </div>
 </template>
@@ -771,7 +774,8 @@ export default {
       default() {
         return [];
       }
-    }
+    },
+    caModel: String
   },
   computed: {
     transform() {
@@ -879,6 +883,7 @@ export default {
       types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
+      console.log(icon);
       return icon;
     },
     isCaLogin() {
@@ -973,6 +978,7 @@ export default {
       loginTitleImg: this.loginTitle,
       loginLogoImg: this.loginLogo,
       loginModel: this.type,
+      caLoginModel: this.caModel,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -1057,8 +1063,8 @@ export default {
   },
   created() {
     this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
-    if (ceshi == 'true' || ceshi == true) {
-      this.loginModel = '0';
+    if (ceshi) {
+      this.loginModel = ceshi == 'true' || ceshi == true ? '0' : ceshi;
     }
     if (this.isScale || util.getParams('scale')) {
       util.setScale();
@@ -1251,6 +1257,7 @@ export default {
           this.$refs[ref] && this.$refs[ref].clearValidate();
         });
       } else {
+        this.submit = true;
         this.$refs.calogin && this.$refs.calogin.getCertificate();
       }
       this.countdown = 0;
@@ -1355,18 +1362,22 @@ export default {
         document.title = res.subsystemName;
       }
       this.app = res.appName || res.subsystemName;
-      if (res.loginModel && ceshi !== 'true' && ceshi !== true) {
+      if (res.loginModel && !ceshi) {
         this.loginModel =
           (res.firstLoginModel || this.firstLoginModel) && !isLogined
             ? res.firstLoginModel || this.firstLoginModel
             : res.loginModel;
       }
+
       if (res.loginBackgroundUrl) {
         this.loginBackgroundImg = res.loginBackgroundUrl.split(',');
       }
       if (res.loginLogoUrl) {
         this.loginLogoImg = res.loginLogoUrl;
       }
+      if (res.caModel) {
+        this.caLoginModel = res.caModel;
+      }
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         if (
@@ -1401,6 +1412,9 @@ export default {
               ? res.firstLoginModel || this.firstLoginModel
               : res.subsystemExtend.loginModel;
         }
+        if (res.subsystemExtend.caModel) {
+          this.caLoginModel = res.subsystemExtend.caModel;
+        }
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }
@@ -1698,7 +1712,10 @@ export default {
         .ajax({
           method: 'post',
           url: this.caAction,
-          data: { identifyingId: this.identifyingId, signedData: signedData }
+          data:
+            typeof signedData === 'string'
+              ? { identifyingId: this.identifyingId, signedData: signedData }
+              : signedData
         })
         .then((res) => {
           this.submit = false;
@@ -1724,6 +1741,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.submit = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1977,6 +1995,9 @@ export default {
     },
     handlePaste(event) {
       this.safe && event.preventDefault();
+    },
+    handleError() {
+      this.submit = false;
     }
   },
   beforeDestroy() {