cloud-web-corejs 1.0.82 → 1.0.84

package/src/views/user/home/default.vue

@@ -56,7 +56,7 @@
                 <i class="el-icon-refresh"></i>
               </el-button>
             </el-tooltip>
-            <el-button type="text" @click="$router.push('/basic/wf/wf_manage/list')" class="more">
+            <el-button type="text" @click="toWfManageList" class="more">
               <i class="el-icon-news"></i>
               <span>{{ $t1('查看更多+') }}</span>
             </el-button>
@@ -183,6 +183,9 @@ import corejsConfig from "@/corejsConfig";
 
 export default {
   name: 'home',
+  props: {
+    wf_manage_url: String
+  },
   components: {
     systemNoticeInfoDialog,
     commMenuDialog,
@@ -217,7 +220,7 @@ export default {
       unreadMessageNum: 0,
       activating: true,
       wfTimer: null,
-      homeConfig:corejsConfig.homeConfig || {}
+      homeConfig: corejsConfig.homeConfig || {}
     };
   },
   activated() {
@@ -467,10 +470,11 @@ export default {
         this.$router.push({path: path, query: {url: route.url}});
       } else {
         let path = this.getPath(route)
+        if (!path) return
         this.$router.push(path);
       }
     },
-    getPath(route3){
+    getPath(route3) {
       let item = null;
       let path = null
       if (route3.type == 0) {
@@ -491,6 +495,9 @@ export default {
         let url = route3.route || route3.url;
         path = url;
       }
+      if (path && path.startsWith("@")) {
+        path = null
+      }
       return path;
     },
     jumpOutLink(route) {
@@ -565,6 +572,10 @@ export default {
         this.showWfDialog = false;
         this.wfClose();
       }
+    },
+    toWfManageList() {
+      let url = this.wf_manage_url || '/basic/wf/wf_manage/list'
+      this.$router.push(url)
     }
   }
 };
@@ -757,7 +768,7 @@ body #app .index-home {
   }
 
   .fast-box {
-        margin: 6px 4px 4px;
+    margin: 6px 4px 4px;
     overflow: hidden;
 
     .item {
@@ -765,6 +776,7 @@ body #app .index-home {
       text-align: center;
       float: left;
       margin-right: 14px;
+
       p {
         color: #2a6494;
         border: solid 1px #e2e2e2;
@@ -797,7 +809,7 @@ body #app .index-home {
           position: absolute;
           left: -1px;
           top: 50%;
-          margin-top:-12px;
+          margin-top: -12px;
         }
 
         &:hover {
@@ -1002,6 +1014,9 @@ body #app .index-home {
       }
     }
   }
-  ::v-deep .el-card.is-always-shadow{box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);}
+
+  ::v-deep .el-card.is-always-shadow {
+    box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);
+  }
 }
 </style>

package/src/views/user/user/edit.vue

@@ -136,14 +136,14 @@
                     <el-input size="small" v-model="user.email" maxlength="200" clearable/>
                   </el-form-item>
                 </td>
-<!--                <th v-if="flag!=='2'">
-                  GUID
-                </th>
-                <td v-if="flag!=='2'">
-                  <el-form-item prop="guid" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input size="small" v-model="user.guid" maxlength="200" clearable/>
-                  </el-form-item>
-                </td>-->
+                <!--                <th v-if="flag!=='2'">
+                                  GUID
+                                </th>
+                                <td v-if="flag!=='2'">
+                                  <el-form-item prop="guid" :rules="[{ required: false, trigger: 'blur' }]">
+                                    <el-input size="small" v-model="user.guid" maxlength="200" clearable/>
+                                  </el-form-item>
+                                </td>-->
                 <th>{{ $t1('地址') }}</th>
                 <td colspan="3">
                   <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
@@ -221,6 +221,13 @@
                     <el-input size="small" v-model="item.guid" maxlength="200" clearable/>
                   </el-form-item>
                   </span>
+                  <span>
+                    <el-form-item label="是否默认组织" :prop="'userCompanyInfoDTOs.'+index1+'.defaults'"
+                                  :rules="[{ required: false, trigger: 'blur' }]">
+                      <el-checkbox v-model="item.defaults"
+                                   @change="changeCompanyDefault(item)"></el-checkbox>
+                  </el-form-item>
+                  </span>
                 </div>
                 <div class="m-2">
                   <div class="d-item" style="width: 65%;">
@@ -754,7 +761,7 @@ export default {
         });
         var items = [];
         rows.forEach(row => {
-          const item = {companyCode: row.companyCode, companyName: row.companyName, guid: null};
+          const item = {companyCode: row.companyCode, companyName: row.companyName, guid: null, defaults: false};
           if (!map[item.companyCode]) {
             items.push(item);
           }
@@ -763,6 +770,9 @@ export default {
         });
         // $grid.insertAt(items, -1);
         this.user.userCompanyInfoDTOs.splice(0, 0, ...items);
+        if (this.user.userCompanyInfoDTOs.length == 1) {
+          this.user.userCompanyInfoDTOs[0].defaults = true
+        }
         // this.user.userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.concat(items);
       }
       callback && callback();
@@ -1015,6 +1025,15 @@ export default {
         this.user.countryName = row.countryName;
         this.user.countryCode = row.countryCode;
       }
+    },
+    changeCompanyDefault(item) {
+      let companyCode = item.companyCode
+      if (item.defaults) {
+        this.user.userCompanyInfoDTOs.forEach(row => {
+          row.defaults = row.companyCode == companyCode;
+        })
+      }
+
     }
   }
 };