|  |  |  | @ -1,36 +1,39 @@ | 
			
		
	
		
			
				
					|  |  |  |  | <template> | 
			
		
	
		
			
				
					|  |  |  |  |   <div> | 
			
		
	
		
			
				
					|  |  |  |  |     <el-card> | 
			
		
	
		
			
				
					|  |  |  |  |       <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-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-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="loading" :data="roleList" | 
			
		
	
		
			
				
					|  |  |  |  |             </el-form-item> | 
			
		
	
		
			
				
					|  |  |  |  |           </el-form> | 
			
		
	
		
			
				
					|  |  |  |  |       <el-table v-loading="Adminloading" :data="AdminroleList" | 
			
		
	
		
			
				
					|  |  |  |  |                 @selection-change="handleSelectionChange" | 
			
		
	
		
			
				
					|  |  |  |  |                 style="width: 100%" | 
			
		
	
		
			
				
					|  |  |  |  |                 border highlight-current-row> | 
			
		
	
	
		
			
				
					|  |  |  | @ -96,12 +99,122 @@ | 
			
		
	
		
			
				
					|  |  |  |  |       </el-table> | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |       <pagination | 
			
		
	
		
			
				
					|  |  |  |  |         v-show="total>0" | 
			
		
	
		
			
				
					|  |  |  |  |         :total="total" | 
			
		
	
		
			
				
					|  |  |  |  |         :page.sync="queryParams.page" | 
			
		
	
		
			
				
					|  |  |  |  |         :limit.sync="queryParams.limit" | 
			
		
	
		
			
				
					|  |  |  |  |         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 | 
			
		
	
		
			
				
					|  |  |  |  |                 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="loading" :data="roleList" | 
			
		
	
		
			
				
					|  |  |  |  |                     @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--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="total>0" | 
			
		
	
		
			
				
					|  |  |  |  |             :total="total" | 
			
		
	
		
			
				
					|  |  |  |  |             :page.sync="queryParams.page" | 
			
		
	
		
			
				
					|  |  |  |  |             :limit.sync="queryParams.limit" | 
			
		
	
		
			
				
					|  |  |  |  |             @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() { | 
			
		
	
	
		
			
				
					|  |  |  | 
 |