cloud-web-corejs 1.0.54-dev.89 → 1.0.54-dev.90

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.89",
+  "version": "1.0.54-dev.90",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/layout/components/Sidebar/default.vue

@@ -130,11 +130,14 @@
 			</span> -->
     </el-dialog>
 
-    <infoIframeDialog v-if="showInfoIframeDialog" :visiable.sync="showInfoIframeDialog"
-                      :dataId="userInfo.id"></infoIframeDialog>
-    <userInfo v-if="showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id" topValue="128px"
+<!--    <infoIframeDialog v-if="showInfoIframeDialog" :visiable.sync="showInfoIframeDialog"
+                      :dataId="userInfo.id"></infoIframeDialog>-->
+    <userInfo v-if="!isFormDev && showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id"
+              topValue="128px"
               @reload="userInfoReload"></userInfo>
-
+    <userFormInfo v-if="isFormDev && showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id"
+                  topValue="128px"
+                  @reload="userInfoReload"></userFormInfo>
     <onlineTalk></onlineTalk>
   </div>
 </template>
@@ -143,6 +146,7 @@
 import {mapGetters} from 'vuex';
 import variables from '@/styles/variables.scss';
 import userInfo from '@base/views/user/user/info.vue';
+import userFormInfo from '@base/views/user/user/form_info.vue';
 import onlineTalk from "@base/components/onlineTalk";
 import {
   getToken
@@ -183,11 +187,12 @@ export default {
       menuModules: [],
       firstMenuHeight: 0, // 第一个菜单的高度
       eveyMenuHeight: 48, // 每一个菜单的高度
+      isFormDev: false,
     };
   },
-  components: {userInfo, onlineTalk, langTool},
+  components: {userInfo, userFormInfo, onlineTalk, langTool},
   computed: {
-    ...mapGetters(['permission_routes', 'sidebar', 'sidebarRouters', 'isBdAdmin']),
+    ...mapGetters(['permission_routes', 'sidebar', 'sidebarRouters', 'isBdAdmin', 'userFlag']),
     activeMenu() {
       const route = this.$route;
       const {meta, path} = route;
@@ -231,8 +236,13 @@ export default {
       this.showCompanyDialog = true;
     }
     initPddLog();//初始化拼多多日志
+    this.initIsFormDev();
   },
   methods: {
+    initIsFormDev() {
+      let userFlag = this.userFlag
+      this.isFormDev = userFlag == 6 || userFlag == 7 || userFlag == 8;
+    },
     getMenuFlag() {
       return !this.isBdAdmin;
     },

package/src/views/user/user/form_info.vue

@@ -0,0 +1,210 @@
+<template>
+  <el-dialog
+    :title="$t1('个人设置')"
+    :append-to-body="true"
+    :modal-append-to-body="falseValue"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog demo-sty_2"
+    width="500px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div id="containt" style="height: 300px">
+      <div class="detail-wrap">
+        <el-form ref="editForm" :model="user">
+          <div class="d-header clearfix">
+            <div class="fl">
+              <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>
+              <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" style="padding-right: 0">
+              <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+              <table class="table-detail">
+                <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('登录名') }}
+                  </th>
+                  <td colspan="3">
+                    {{ user.loginAccount }}
+                  </td>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('姓名') }}
+                  </th>
+                  <td colspan="3">
+                    <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>
+                </tr>
+                <tr>
+                  <th>{{ $t1('密码') }}</th>
+                  <td colspan="3">
+                    <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
+                      />
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1('确认密码') }}</th>
+                  <td colspan="3">
+                    <el-form-item prop="rePassword" :rules="pass2Rules">
+                      <el-input
+                        size="small"
+                        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>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'userInfo',
+  components: {},
+  props: ['_dataId'],
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  data() {
+    var validatePass = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      if (isPassRequired && (value == '' || value == undefined)) {
+        callback(new Error(this.$t1('密码不能为空')));
+      } else {
+        callback();
+      }
+      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 : '';
+
+      if (isPassRequired && rePassword == '') {
+        callback(new Error(this.$t1('确认密码不能为空')));
+      } else if (rePassword != password) {
+        callback(new Error(this.$t1('两次输入密码不一致!')));
+      } else {
+        callback();
+      }
+    };
+    return {
+      showDialog: true,
+      falseValue: false,
+      dataId: '',
+      hBtn: true,
+      user: {},
+      vxeOption: {},
+      companyInfoOption: {},
+      userRoleOption: {},
+      showContent: true,
+      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
+      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
+    };
+  },
+  methods: {
+    getData() {
+      let t = this._dataId;
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/user/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            var user = res.objx || {};
+            this.user = res.objx || {};
+            this.user.password = '';
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.user = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + '/user/updateUserInfo';
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.user,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    this.reloadContent();
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false);
+    },
+    reloadContent() {
+      this.user = {};
+      this.getData();
+    }
+  }
+};
+</script>

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

@@ -7,12 +7,12 @@
     :visible.sync="showDialog"
     :modal="falseValue"
     custom-class="dialog-style list-dialog demo-sty_2"
-    width="500px"
+    width="1000px"
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div id="containt" style="height: 300px">
+    <div id="containt">
       <div class="detail-wrap">
         <el-form ref="editForm" :model="user">
           <div class="d-header clearfix">
@@ -29,7 +29,7 @@
             </div>
           </div>
           <div class="d-cont" style="height: auto">
-            <div class="d-item" style="padding-right: 0">
+            <div class="d-item">
               <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
               <table class="table-detail">
                 <tbody>
@@ -38,25 +38,41 @@
                     <em class="f-red">*</em>
                     {{ $t1('登录名') }}
                   </th>
-                  <td colspan="3">
-                    {{ user.loginAccount }}
+                  <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>
-                </tr>
-                <tr>
-                  <th>
-                    <em class="f-red">*</em>
-                    {{ $t1('姓名') }}
-                  </th>
-                  <td colspan="3">
-                    <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/>
+                  <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>
-                </tr>
-                <tr>
                   <th>{{ $t1('密码') }}</th>
-                  <td colspan="3">
+                  <td>
                     <el-form-item prop="password" :rules="passRules">
                       <el-input
                         size="small"
@@ -70,10 +86,8 @@
                       />
                     </el-form-item>
                   </td>
-                </tr>
-                <tr>
                   <th>{{ $t1('确认密码') }}</th>
-                  <td colspan="3">
+                  <td>
                     <el-form-item prop="rePassword" :rules="pass2Rules">
                       <el-input
                         size="small"
@@ -89,6 +103,62 @@
                     </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>
                 </tbody>
               </table>
             </div>

package/src/layout/components/Sidebar/mixins/pdd.js

@@ -1,50 +0,0 @@
-import settingConfig from "@/settings";
-
-export function initPddLog(){
-  if(!pddLogEnabled || !window.PDD_OPEN_init)return
-  setInterval(function(){
-    pddIntfHandle();
-  },5000)
-}
-
-function getPageCode(callback) {
-  return window.$vueRoot.$http({
-    url: "/pdd_api/router",
-    method: 'post',
-    data: {"id": "pdd.cloud.isv.page.code"},
-    success: res => {
-      callback(res.objx)
-    }
-  });
-}
-
-function handlePati(pati) {
-  return window.$vueRoot.$http({
-    url: "/pdd_api/router",
-    method: 'post',
-    data: {"id": "pdd.cloud.isv.page.code",pati},
-    success: res => {
-
-    }
-  });
-}
-
-async function pddIntfHandle() {
-    getPageCode(async (pageCode)=>{
-      PDD_OPEN_init({
-        code: pageCode
-        // 对于获取 code 接口或未登录态，可不传 code：PDD_OPEN_init({}, function () { ... })
-      }, function () {
-        // 初始化已完成
-        window.PDD_OPEN_getPati().then(
-          function (pati) {
-            // 使用 pati
-            handlePati(pati)
-          }).catch(error => console.log(error))
-      })
-
-    })
-}
-
-
-export default modules