cloud-web-corejs 1.0.54-dev.176 → 1.0.54-dev.178

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

@@ -76,18 +76,18 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import '@/resources/css/login.scss';
+@import '@base/resources/css/login.scss';
 
 .login-container.tc {
-  background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login5.jpg) center center/cover no-repeat;
 }
 
 .login-container.chigo {
-  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login6.jpg) center center/cover no-repeat;
 }
 
 .login-container.pcp {
-  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login8.jpg) center center/cover no-repeat;
 }
 
 .el-select-dropdown {

package/src/views/user/login/index2.vue

@@ -76,18 +76,18 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import '@/resources/css/login.scss';
+@import '@base/resources/css/login.scss';
 
 .login-container.tc {
-  background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login5.jpg) center center/cover no-repeat;
 }
 
 .login-container.chigo {
-  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login6.jpg) center center/cover no-repeat;
 }
 
 .login-container.pcp {
-  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
+  background: url(~@base/resources/images/bg-login8.jpg) center center/cover no-repeat;
 }
 
 .el-select-dropdown {

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,12 @@
                     <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 +760,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 +769,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 +1024,17 @@ 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 => {
+          if (row.companyCode !== companyCode) {
+            item.defaults = false;
+          }
+        })
+      }
+
     }
   }
 };