cloud-web-corejs-haier 1.0.42 → 1.0.44

package/src/views/user/user/info.vue

@@ -17,148 +17,237 @@
         <el-form ref="editForm" :model="user">
           <div class="d-header clearfix">
             <div class="fl">
-              <i class="el-icon-info"/>
-              {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
+              <i class="el-icon-info" />
+              {{ dataId ? $t1("查看用户") : $t1("新增用户") }}
             </div>
             <div class="fr">
-              <el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
-                {{ $t1('重置') }}
+              <el-button
+                type="primary"
+                plain
+                class="button-sty"
+                @click="reloadContent"
+                icon="el-icon-refresh-right"
+              >
+                {{ $t1("重置") }}
               </el-button>
-              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+              <el-button
+                type="primary"
+                class="button-sty"
+                icon="el-icon-check"
+                @click="saveData"
+                >{{ $t1("保存") }}
               </el-button>
             </div>
           </div>
           <div class="d-cont" style="height: auto">
             <div class="d-item">
-              <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+              <div class="title first">
+                <b>{{ $t1("基本信息") }}</b>
+              </div>
               <table class="table-detail">
                 <tbody>
-                <tr>
-                  <th>
-                    <em class="f-red">*</em>
-                    {{ $t1('登录名') }}
-                  </th>
-                  <td>
-                    <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
-                      <template v-if="dataId">
+                  <tr>
+                    <th>
+                      <em class="f-red">*</em>
+                      {{ $t1("登录名") }}
+                    </th>
+                    <td>
+                      <el-form-item
+                        prop="loginAccount"
+                        :rules="[{ required: true, trigger: 'blur' }]"
+                      >
+                        <template v-if="dataId">
+                          <el-input
+                            size="small"
+                            v-model="user.loginAccount"
+                            maxlength="255"
+                            autocomplete="off"
+                            lay-verify="required"
+                            required=""
+                            :readonly="true"
+                          />
+                        </template>
+                        <template v-else>
+                          <el-input
+                            size="small"
+                            v-model="user.loginAccount"
+                            maxlength="255"
+                            autocomplete="off"
+                            lay-verify="required"
+                            required=""
+                            clearable
+                          />
+                        </template>
+                      </el-form-item>
+                    </td>
+                    <th>{{ $t1("手机") }}</th>
+                    <td>
+                      <el-form-item
+                        prop="mobile"
+                        :rules="[{ required: false, trigger: 'blur' }]"
+                      >
                         <el-input
                           size="small"
-                          v-model="user.loginAccount"
+                          v-model="user.mobile"
+                          type="text"
                           maxlength="255"
                           autocomplete="off"
-                          lay-verify="required"
-                          required=""
-                          :readonly="true"
+                          lay-verify="required|phone"
+                          clearable
+                        />
+                      </el-form-item>
+                    </td>
+                    <th>{{ $t1("密码") }}</th>
+                    <td>
+                      <el-form-item prop="password" :rules="passRules">
+                        <el-input
+                          size="small"
+                          type="password"
+                          v-model="user.password"
+                          show-password
+                          maxlength="255"
+                          autocomplete="off"
+                          auto-complete="new-password"
+                          clearable
                         />
-                      </template>
-                      <template v-else>
+                      </el-form-item>
+                    </td>
+                    <th>{{ $t1("确认密码") }}</th>
+                    <td>
+                      <el-form-item prop="rePassword" :rules="pass2Rules">
                         <el-input
                           size="small"
-                          v-model="user.loginAccount"
+                          type="password"
+                          v-model="user.rePassword"
+                          show-password
                           maxlength="255"
                           autocomplete="off"
+                          auto-complete="new-password"
+                          lay-verify="confirmPass"
+                          clearable
+                        />
+                      </el-form-item>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>
+                      <em class="f-red">*</em>
+                      {{ $t1("姓名") }}
+                    </th>
+                    <td>
+                      <el-form-item
+                        prop="nickName"
+                        :rules="[{ required: true, trigger: 'blur' }]"
+                      >
+                        <el-input
+                          size="small"
+                          v-model="user.nickName"
+                          maxlength="200"
                           lay-verify="required"
                           required=""
                           clearable
                         />
-                      </template>
-                    </el-form-item>
-                  </td>
-                  <th>{{ $t1('手机') }}</th>
-                  <td>
-                    <el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
-                      <el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off"
-                                lay-verify="required|phone" clearable/>
-                    </el-form-item>
-                  </td>
-                  <th>{{ $t1('密码') }}</th>
-                  <td>
-                    <el-form-item prop="password" :rules="passRules">
+                      </el-form-item>
+                    </td>
+                    <th>{{ $t1("性别") }}</th>
+                    <td>
+                      <el-radio-group v-model="user.gender">
+                        <el-radio :label="1">{{ $t1("男") }}</el-radio>
+                        <el-radio :label="2">{{ $t1("女") }}</el-radio>
+                      </el-radio-group>
+                    </td>
+                    <th>{{ $t1("出生日期") }}</th>
+                    <td>
+                      <el-date-picker
+                        size="small"
+                        v-model="user.birth"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        clearable
+                      />
+                    </td>
+                    <th>{{ $t1("邮编") }}</th>
+                    <td>
                       <el-input
                         size="small"
-                        type="password"
-                        v-model="user.password"
-                        show-password
+                        id="zipCode"
+                        v-model="user.zipCode"
+                        name="zipCode"
                         maxlength="255"
-                        autocomplete="off"
-                        auto-complete="new-password"
                         clearable
                       />
-                    </el-form-item>
-                  </td>
-                  <th>{{ $t1('确认密码') }}</th>
-                  <td>
-                    <el-form-item prop="rePassword" :rules="pass2Rules">
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>{{ $t1("地址") }}</th>
+                    <td colspan="3">
                       <el-input
                         size="small"
-                        type="password"
-                        v-model="user.rePassword"
-                        show-password
+                        v-model="user.address"
+                        class="b"
                         maxlength="255"
-                        autocomplete="off"
-                        auto-complete="new-password"
-                        lay-verify="confirmPass"
                         clearable
                       />
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <th>
-                    <em class="f-red">*</em>
-                    {{ $t1('姓名') }}
-                  </th>
-                  <td>
-                    <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
-                      <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
-                                clearable/>
-                    </el-form-item>
-                  </td>
-                  <th>{{ $t1('性别') }}</th>
-                  <td>
-                    <el-radio-group v-model="user.gender">
-                      <el-radio :label="1">{{ $t1('男') }}</el-radio>
-                      <el-radio :label="2">{{ $t1('女') }}</el-radio>
-                    </el-radio-group>
-                  </td>
-                  <th>{{ $t1('出生日期') }}</th>
-                  <td>
-                    <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
-                                    value-format="yyyy-MM-dd" clearable/>
-                  </td>
-                  <th>{{ $t1('邮编') }}</th>
-                  <td>
-                    <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255"
-                              clearable/>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('地址') }}</th>
-                  <td colspan="3">
-                    <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
-                  </td>
-                  <th>{{ $t1('设置') }}</th>
-                  <td colspan="3">
-                    <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('头像') }}</th>
-                  <td colspan="7">
-                    <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
-                                dataType="medium"></baseUpload>
-                  </td>
-                </tr>
-                <tr>
-                  <th>{{ $t1('创建人') }}</th>
-                  <td>{{ user.createBy }}</td>
-                  <th>{{ $t1('创建时间') }}</th>
-                  <td>{{ user.createDate }}</td>
-                  <th>{{ $t1('更新人') }}</th>
-                  <td>{{ user.modifyBy }}</td>
-                  <th>{{ $t1('更新时间') }}</th>
-                  <td>{{ user.modifyDate }}</td>
-                </tr>
+                    </td>
+                    <th>{{ $t1("设置") }}</th>
+                    <td colspan="3">
+                      <el-checkbox
+                        label="是否启用"
+                        v-model="user.enabled"
+                      ></el-checkbox>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>
+                      {{ $t1("地区") }}
+                    </th>
+                    <td colspan="3">
+                      <el-form-item
+                        prop="areaName"
+                        :rules="[{ required: false, trigger: 'blur' }]"
+                      >
+                        <el-input
+                          class="search-input"
+                          v-model="user.areaName"
+                          clearable
+                          @clear="
+                            user.areaName = null;
+                            user.areaId = null;
+                          "
+                          v-el-readonly
+                        >
+                          <i
+                            slot="suffix"
+                            class="el-input__icon el-icon-search"
+                            @click="showAreaDialog = true"
+                          ></i>
+                        </el-input>
+                      </el-form-item>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>{{ $t1("头像") }}</th>
+                    <td colspan="7">
+                      <baseUpload
+                        :limit="1"
+                        accept="image/png, image/jpeg"
+                        multi="false"
+                        :file.sync="user.headPhotoUrl"
+                        dataType="medium"
+                      ></baseUpload>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>{{ $t1("创建人") }}</th>
+                    <td>{{ user.createBy }}</td>
+                    <th>{{ $t1("创建时间") }}</th>
+                    <td>{{ user.createDate }}</td>
+                    <th>{{ $t1("更新人") }}</th>
+                    <td>{{ user.modifyBy }}</td>
+                    <th>{{ $t1("更新时间") }}</th>
+                    <td>{{ user.modifyDate }}</td>
+                  </tr>
                 </tbody>
               </table>
             </div>
@@ -166,14 +255,22 @@
         </el-form>
       </div>
     </div>
+    <areaDialog
+      v-if="showAreaDialog"
+      :visiable.sync="showAreaDialog"
+      @confirm="confirmArea"
+      multi="false"
+    />
   </el-dialog>
 </template>
 
 <script>
 export default {
-  name: 'userInfo',
-  components: {},
-  props: ['_dataId'],
+  name: "userInfo",
+  components: {
+    areaDialog: () => import("../../../views/user/area/dialog.vue"),
+  },
+  props: ["_dataId"],
   created() {
     if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
   },
@@ -183,22 +280,23 @@ export default {
   data() {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
-      if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error(this.$t1('密码不能为空')));
+      if (isPassRequired && (value == "" || value == undefined)) {
+        callback(new Error(this.$t1("密码不能为空")));
       } else {
         callback();
       }
-      this.$refs.editForm.validateField('rePassword');
+      this.$refs.editForm.validateField("rePassword");
     };
     var validatePass2 = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
-      const rePassword = value != undefined ? value : '';
-      const password = this.user.password != undefined ? this.user.password : '';
+      const rePassword = value != undefined ? value : "";
+      const password =
+        this.user.password != undefined ? this.user.password : "";
 
-      if (isPassRequired && rePassword == '') {
-        callback(new Error(this.$t1('确认密码不能为空')));
+      if (isPassRequired && rePassword == "") {
+        callback(new Error(this.$t1("确认密码不能为空")));
       } else if (rePassword != password) {
-        callback(new Error(this.$t1('两次输入密码不一致!')));
+        callback(new Error(this.$t1("两次输入密码不一致!")));
       } else {
         callback();
       }
@@ -206,15 +304,23 @@ export default {
     return {
       showDialog: true,
       falseValue: false,
-      dataId: '',
+      dataId: "",
       hBtn: true,
-      user: {},
+      user: {
+        areaName: null,
+        areaId: null,
+      },
       vxeOption: {},
       companyInfoOption: {},
       userRoleOption: {},
       showContent: true,
-      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
-      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
+      passRules: [
+        { validator: validatePass, trigger: "blur", required: false },
+      ],
+      pass2Rules: [
+        { validator: validatePass2, trigger: "blur", required: false },
+      ],
+      showAreaDialog: false,
     };
   },
   methods: {
@@ -226,55 +332,62 @@ export default {
           url: USER_PREFIX + `/user/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             var user = res.objx || {};
             this.user = res.objx || {};
-            this.user.password = '';
-          }
+            this.user.password = "";
+          },
         });
       } else {
         this.isEdit = false;
         this.user = {
-          enabled: true
+          enabled: true,
         };
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + '/user/updateUserInfo';
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
+            var url = USER_PREFIX + "/user/updateUserInfo";
             this.$http({
               url: url,
               method: `post`,
               data: this.user,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
+                  type: "success",
                   duration: 500,
-                  onClose: t => {
+                  onClose: (t) => {
                     this.reloadContent();
-                  }
+                  },
                 });
-              }
+              },
             });
           });
         }
       });
     },
     dialogClose() {
-      this.$emit('update:visiable', false);
+      this.$emit("update:visiable", false);
     },
     reloadContent() {
       this.user = {};
       this.getData();
-    }
-  }
+    },
+    confirmArea(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.user.areaId = row.id;
+        this.user.areaName = row.fullName;
+      }
+    },
+  },
 };
 </script>