修改用户管理 角色管理 登陆页面

src/api/system/invWarehouse.js

@@ -243,4 +243,13 @@ export function getInvListByUser(params) {
 }
 
 
+export function selectInvById(params) {
+  return axios({
+    url: "/spms/inv/warehouse/selectInvById",
+    method: "post",
+    data: params
+  });
+}
+
+
 

src/views/myLogin.vue

@@ -20,7 +20,7 @@
         <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
           <img alt="element-logo" src="@/assets/logo/logo.png"/>
         </div>
-        <h3 class="title">供应商自助管理系统</h3>
+        <h3 class="title">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
           <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
             <i slot="prefix" class="el-input__icon">
@@ -67,17 +67,23 @@
     <div style="
           position: absolute;
           bottom: 0;
-          left: 50%;
+          margin-left: 36%;
-          transform: translate(-50%, -50%);
+          font-size: 18px;
-          font-size: 12px;
           color: white;
         ">
+
       <a href="http://www.xmglxp.com/" target="_blank">
+        软件名称: 医院UDI管理系统
+      </a>
+      <a href="http://www.xmglxp.com/" target="_blank" style="margin-left: 20px; font-size: 12px">
        开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
       </a>
-
     </div>
 
+
+
+
+
   </div>
 </template>
 

src/views/system/role/index.vue

@@ -1,6 +1,114 @@
 <template>
   <div>
     <el-card>
+      <el-tabs type="border-card" >
+        <el-tab-pane>
+          <span slot="label">内部角色</span>
+          <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
+            <el-form-item label="角色名称:" prop="roleName">
+              <el-input
+                v-model="queryParams.roleName"
+                placeholder="请输入角色名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态:" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="请选择角色状态"
+                clearable
+              >
+                <el-option label="正常" :value="0"/>
+                <el-option label="禁用" :value="1"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+              </el-button-group>
+
+            </el-form-item>
+          </el-form>
+      <el-table v-loading="Adminloading" :data="AdminroleList"
+                @selection-change="handleSelectionChange"
+                style="width: 100%"
+                border highlight-current-row>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"/>
+        <!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150"/>-->
+        <!--      <el-table-column label="显示顺序" prop="roleSort" width="100"/>-->
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.status | statusFilterType">{{
+                scope.row.status | statusFilterName
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+
+        <!--      <el-table-column label="状态" align="center" width="100">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-switch-->
+        <!--            v-model="scope.row.status"-->
+        <!--            active-value="0"-->
+        <!--            inactive-value="1"-->
+        <!--            @change="handleStatusChange(scope.row)"-->
+        <!--          ></el-switch>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button
+              :disabled="scope.row.roleId === 1"
+              type="text"
+              @click="handleUpdate(scope.row)"
+            >编辑
+            </el-button>
+            <el-button
+              type="text"
+              :disabled="scope.row.roleId === 1"
+              @click="handleDelete(scope.row)"
+            >删除
+            </el-button>
+            <!--          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
+            <!--          >-->
+            <!--          <span class="el-dropdown-link">-->
+            <!--              <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
+            <!--            </span>-->
+            <!--            <el-dropdown-menu slot="dropdown">-->
+            <!--              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
+            <!--              >数据权限-->
+            <!--              </el-dropdown-item>-->
+            <!--              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
+            <!--              >分配用户-->
+            <!--              </el-dropdown-item>-->
+            <!--            </el-dropdown-menu>-->
+            <!--          </el-dropdown>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="Admintotal>0"
+        :total="Admintotal"
+        :page.sync="AdminParams.page"
+        :limit.sync="AdminParams.limit"
+        @pagination="getList"
+      />
+        </el-tab-pane>
+
+        <el-tab-pane>
+          <span slot="label">供应商角色</span>
           <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
             <el-form-item label="角色名称:" prop="roleName">
               <el-input
@@ -100,8 +208,13 @@
             :total="total"
             :page.sync="queryParams.page"
             :limit.sync="queryParams.limit"
-        @pagination="getList"
+            @pagination="getCustomerList"
           />
+        </el-tab-pane>
+
+
+
+        </el-tabs>
 
       <!-- 添加或修改角色配置对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
@@ -230,6 +343,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      Adminloading:true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -240,6 +354,9 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      Admintotal:0,
+      //内部角色
+      AdminroleList:[],
       // 角色表格数据
       roleList: [],
       // 弹出层标题
@@ -289,6 +406,8 @@ export default {
         roleKey: undefined,
         status: undefined
       },
+      AdminParams:{},
+      Params:{},
       // 表单参数
       form: {},
       defaultProps: {
@@ -330,13 +449,27 @@ export default {
 
   created() {
     this.getList();
+    this.getCustomerList();
   },
   methods: {
     /** 查询角色列表 */
     getList() {
+      this.Adminloading =true;
+       this.AdminParams=this.queryParams
+      this.AdminParams.isCustomer=0;
+      listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => {
+              this.AdminroleList=response.data.list
+              this.Admintotal = response.data.total;
+              this.Adminloading =false;
+        }
+      );
+    },
+    getCustomerList() {
       this.loading = true;
+      this.Params=this.queryParams
+      this.Params.isCustomer=1;
       listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.roleList = response.data.list;
+              this.roleList=response.data.list
           this.total = response.data.total;
           this.loading = false;
         }
@@ -430,6 +563,7 @@ export default {
     handleQuery() {
       this.queryParams.page = 1;
       this.getList();
+      this.getCustomerList();
     },
     /** 重置按钮操作 */
     resetQuery() {

src/views/system/user/authUser.vue

@@ -150,6 +150,7 @@
                   placeholder="请选择"
                   :remote-method="findDeptMethod"
                   :loading="loading"
+                  @change="findInv"
                 >
                   <el-option
                     v-for="item in fromDeptOptions"
@@ -165,19 +166,37 @@
 
               </el-form-item>
             </el-col>
-
             <el-col :span="11" type="flex">
-              <el-form-item label="状态" prop="userFlag">
+              <el-form-item label="所属仓库" prop="depts">
-                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
+                <el-select
-                  <el-radio :label="1">正常</el-radio>
+                  v-model="formData.warehouseName"
-                  <el-radio :label="0">禁用</el-radio>
+                  filterable
+                  remote
+                  clearable="true"
+                  style="width: 90%"
+                  size="small"
+                  reserve-keyword
+                  placeholder="请选择"
+                  :loading="loading"
+                >
+                  <el-option
+                    v-for="item in fromWarehouseOptions"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code">
+                    <span style="float: left">{{ item.code }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                        item.name
+                      }}</span>
+                  </el-option>
+                </el-select>
 
-                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
           <el-row :gutter="20" type="flex">
-            <el-col :span="23" type="flex">
+            <el-col :span="11" type="flex">
               <el-form-item label="角色">
                 <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1">
                   <el-checkbox
@@ -190,6 +209,16 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="11" type="flex">
+              <el-form-item label="状态" prop="userFlag">
+                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
+                  <el-radio :label="1">正常</el-radio>
+                  <el-radio :label="0">禁用</el-radio>
+
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row type="flex">
             <el-col :span="23" type="flex">
@@ -230,7 +259,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
 import {listRole} from "@/api/system/role";
 import {selectSysParamByKey} from "@/api/system/systemParamConfig";
-import {filterList} from "@/api/system/invWarehouse";
+import { filterList, selectInvById } from '@/api/system/invWarehouse'
 
 const formJson = {
   id: "",
@@ -287,6 +316,7 @@ export default {
       formData: formJson,
       selectDeptList: [],
       fromDeptOptions: [],
+      fromWarehouseOptions:[],
       configParms: {},
       formRules: {},
       addRules: {
@@ -349,6 +379,16 @@ export default {
       this.query.page = 1;
       this.getList();
     },
+    findInv(val){
+    // 获取仓库列表
+      selectInvById(val)
+        .then((res) => {
+            if(res.code == 20000){
+                  this.fromWarehouseOptions = res.data || [];
+            }
+        })
+
+    },
     handleCurrentChange(val) {
       this.query.page = val;
       this.getList();
@@ -416,6 +456,7 @@ export default {
           roles: row.roles,
           depts: row.depts,
           dept: row.dept,
+          warehouseName:row.warehouseName
         };
       }
       this.formName = "add";
@@ -440,10 +481,12 @@ export default {
         this.$message.error("未指定角色！")
         return;
       }
+      debugger
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.formLoading = true;
           let data = Object.assign({}, this.formData);
+          debugger
           authAdminSave(data, this.formName).then(response => {
             this.formLoading = false;
             if (response.code !== 20000) {