mz666
/
bocai_supplyChain_pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
cyl/dev
wangxia 2 years ago
parent 7d5c6a5a46
commit e360f30372
7 changed files with 111 additions and 63 deletions
Show Stats Download Patch File Download Diff File

14
src/api/userinfo.js
Unescape Escape View File

@ -277,3 +277,17 @@ export function delMemberGroupApi (data) {
method: "get", method: "get",
}); });
} }
// 成员管理分组下移
export function moveGroupNextApi (data) {
return request({
url: "/yishoudan/agency/team/next/" + data,
method: "get",
});
}
// 成员管理分组上移
export function moveGroupPrevApi (data) {
return request({
url: "/yishoudan/agency/team/prev/" + data,
method: "get",
});
}

8
src/components/FirstJob/joblist.vue
Unescape Escape View File

@ -47,7 +47,7 @@
<!-- 筛选导航 --> <!-- 筛选导航 -->
<div class="navigation"> <div class="navigation">
<div class="w" id="navigation"> <div class="w" id="navigation">
<span> <span class="dn">
<!-- <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i> --> <!-- <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i> -->
<router-link to="/main"> <router-link to="/main">
<!-- <svg class="icon" aria-hidden="true"> <!-- <svg class="icon" aria-hidden="true">
@ -1683,7 +1683,7 @@ export default {
} }
.searchBox { .searchBox {
position: relative; position: relative;
margin-left: 100px; // margin-left: 100px;
line-height: 44px; line-height: 44px;
z-index: 10; z-index: 10;
.hotStore { .hotStore {
@ -1748,9 +1748,10 @@ export default {
.searchinput { .searchinput {
// margin-top: 19px; // margin-top: 19px;
// margin-right: 285px; // margin-right: 285px;
width: 685px; // width: 685px;
// height: 44px; // height: 44px;
&.ant-input-affix-wrapper { &.ant-input-affix-wrapper {
width: 943px;
position: relative; position: relative;
.ant-input-prefix { .ant-input-prefix {
position: absolute; position: absolute;
@ -1815,7 +1816,6 @@ export default {
} }
} }
> .ant-input { > .ant-input {
width: 607px;
height: 40px; height: 40px;
text-indent: 60px; text-indent: 60px;
background: #fff; background: #fff;

70
src/components/merchantManagement/memberInfo.vue
Unescape Escape View File

@ -14,8 +14,8 @@
<div class="searchbox pb12 ml12 mr12"> <div class="searchbox pb12 ml12 mr12">
<div class="searchinput"> <div class="searchinput">
<a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"> <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
<a-icon slot="prefix" type="search" class="cccc" /> <!-- <a-icon slot="prefix" type="search" class="cccc" /> -->
<a-button slot="enterButton" class="cblue">搜索</a-button> <!-- <a-button slot="enterButton" class="cblue">搜索</a-button> -->
</a-input-search> </a-input-search>
</div> </div>
<!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> --> <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
@ -59,8 +59,8 @@
<div class="groupdropdownbox backTable" slot="overlay"> <div class="groupdropdownbox backTable" slot="overlay">
<div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div> <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
<div @click="delGroup(item)">删除</div> <div @click="delGroup(item)">删除</div>
<div @click="index != 0?moveList(index,'up'):null" :class="index == 0 ? 'unactive':''">上移</div> <div @click="index != 0?moveList(item,'up'):null" :class="index == 0 ? 'unactive':''">上移</div>
<div @click="index + 1 < groupList.length?moveList(index,'down'):null" :class="index + 1 == groupList.length? 'unactive':''">下移</div> <div @click="index + 1 < groupList.length?moveList(item,'down'):null" :class="index + 1 == groupList.length? 'unactive':''">下移</div>
</div> </div>
</a-dropdown> </a-dropdown>
</a-menu-item> </a-menu-item>
@ -69,14 +69,14 @@
<div class="pt12 ml12 mr12 mt4 bt1"> <div class="pt12 ml12 mr12 mt4 bt1">
<a-button type="dashed" class="setMiddle" icon="plus" @click="[addGroupShow = true,isEdit = false]"> <a-button type="dashed" class="setMiddle" icon="plus" @click="[addGroupShow = true,isEdit = false]">
<!-- <i class="iconfont icon-fangda c6 f12 mr8" style="line-height:32px"></i> --> <!-- <i class="iconfont icon-fangda c6 f12 mr8" style="line-height:32px"></i> -->
添加部门 <span class="ml4">添加部门</span>
</a-button> </a-button>
</div> </div>
</div> </div>
</div> </div>
<div class="rightContainer mb24"> <div class="rightContainer mb24">
<div class="fsa pb14 bb1 mb24"> <div class="fsa pb14 bb1 mb24">
<div class="f16 fw500">{{modalTitle ? modalTitle : selectedKeys[0] == 'all' ? '全部成员（19人）':selectedKeys[0] + '（8人）' }}</div> <div class="f16 fw500">{{ selectedKeys[0] == 'all' ? '全部成员（19人）':selectedKeys[0] + '（8人）' }}</div>
<!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> --> <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
<a-button class="addmemeber f14" @click="showDetail('add')"> <a-button class="addmemeber f14" @click="showDetail('add')">
<i class="iconfont icon-fangda"></i> 添加成员 <i class="iconfont icon-fangda"></i> 添加成员
@ -186,7 +186,7 @@
<a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow"> <a-modal :title="modalTitle" v-model="visible" centered id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow">
<template slot="footer" v-if="this.modalTitle != '成员详情'"> <template slot="footer" v-if="this.modalTitle != '成员详情'">
<a-button key="back" @click="modalCancel">取消</a-button> <a-button key="back" @click="modalCancel">取消</a-button>
<a-button key="submit" class="ml16 mr16" type="primary" :loading="loading" @click="handleSubmit">确定</a-button> <a-button key="submit" class="ml16" type="primary" :loading="loading" @click="handleSubmit">确定</a-button>
</template> </template>
<template slot="footer" v-else> <template slot="footer" v-else>
<span></span> <span></span>
@ -226,26 +226,18 @@
<div slot="dropdownRender" slot-scope="menu"> <div slot="dropdownRender" slot-scope="menu">
<div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index"> <div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index">
<div>{{item.teamName}}</div> <div>{{item.teamName}}</div>
<div>
<span @click="[addGroupShow = true,isEdit = true,recordId = item.id]">修改</span>
<span @click.stop="delGroup(item)">删除</span>
</div>
</div> </div>
<div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> <!-- <div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> -->
</div> </div>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="角色"> <a-form-item label="角色">
<a-select default-value="lucy" placeholder="请选择角色" v-decorator="['agencyTeamId',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop"> <a-select default-value="lucy" placeholder="请选择角色" v-decorator="['role',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop">
<div slot="dropdownRender" slot-scope="menu"> <div slot="dropdownRender" slot-scope="menu">
<div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index"> <div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index">
<div>{{item.teamName}}</div> <div>{{item.teamName}}</div>
<div>
<span @click="[addGroupShow = true,isEdit = true,recordId = item.id]">修改</span>
<span @click.stop="delGroup(item)">删除</span>
</div>
</div> </div>
<div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> <!-- <div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> -->
</div> </div>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -291,7 +283,7 @@
</template> </template>
<script> <script>
import { getMemberListApi, deleteMemberApi, addMemberApi, getMemberGroupApi, addMemberGroupApi, updateMemberGroupApi, delMemberGroupApi, updateMemberApi } from '../../api/userinfo' import { getMemberListApi, deleteMemberApi, addMemberApi, getMemberGroupApi, addMemberGroupApi, updateMemberGroupApi, delMemberGroupApi, updateMemberApi, moveGroupNextApi, moveGroupPrevApi } from '../../api/userinfo'
import { formatDateYMD, getUserApplyOrderStatusById, getAgencyRoleTypeById, getAgencyPermissionNameById, getAgencyPermissionsByRole, tableWidth } from '../../utils/commonUtil' import { formatDateYMD, getUserApplyOrderStatusById, getAgencyRoleTypeById, getAgencyPermissionNameById, getAgencyPermissionsByRole, tableWidth } from '../../utils/commonUtil'
export default { export default {
@ -708,7 +700,7 @@ export default {
aliasName: this.currentMember.aliasName, aliasName: this.currentMember.aliasName,
tel: this.currentMember.tel, tel: this.currentMember.tel,
group: this.currentMember.group, group: this.currentMember.group,
agencyTeamId: this.currentMember.teamName, agencyTeamId: this.currentMember.agencyTeamName,
}) })
}, 200) }, 200)
} else if (type == 'detail') { } else if (type == 'detail') {
@ -887,18 +879,30 @@ export default {
that.$forceUpdate() that.$forceUpdate()
}, 10) }, 10)
}, },
moveList(index, type) { moveList(item, type) {
console.log(index) console.log(item)
if (type == 'up') { if (type == 'up') {
let middle = this.groupList[index - 1] // let middle = this.groupList[index - 1]
this.groupList[index - 1] = this.groupList[index] // this.groupList[index - 1] = this.groupList[index]
this.groupList[index] = middle // this.groupList[index] = middle
moveGroupPrevApi(item.id).then((res) => {
console.log(res)
if(res.data.status == 200){
this.getMemberGroup()
}
})
} else { } else {
let middle = this.groupList[index + 1] // let middle = this.groupList[index + 1]
this.groupList[index + 1] = this.groupList[index] // this.groupList[index + 1] = this.groupList[index]
this.groupList[index] = middle // this.groupList[index] = middle
moveGroupNextApi(item.id).then((res) => {
console.log(res)
if(res.data.status == 200){
this.getMemberGroup()
}
})
} }
this.$forceUpdate() // this.$forceUpdate()
}, },
}, },
} }
@ -1005,6 +1009,9 @@ export default {
/deep/ .searchbox { /deep/ .searchbox {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.searchinput{
width: 100%;
}
// padding-bottom: 14px; // padding-bottom: 14px;
} }
.leftMenu { .leftMenu {
@ -1136,7 +1143,7 @@ export default {
// } // }
.delete { .delete {
// border-left: 1px solid #979797; // border-left: 1px solid #979797;
border-right: 1px solid #979797; border-right: 1px solid #eee;
padding: 0 6px 0 0; padding: 0 6px 0 0;
margin: 0 6px 0 0; margin: 0 6px 0 0;
} }
@ -1222,7 +1229,7 @@ export default {
padding: 9px 16px; padding: 9px 16px;
&:hover { &:hover {
> div { > div {
color: #ff4400 !important; color: #1890ff !important;
} }
} }
} }
@ -1271,7 +1278,6 @@ export default {
padding: 0 12px; padding: 0 12px;
line-height: 32px; line-height: 32px;
cursor: no-drop; cursor: no-drop;
} }
} }
</style> </style>

34
src/components/merchantManagement/notificationCenter.vue
Unescape Escape View File

@ -1,5 +1,31 @@
<template> <template>
<div class="">通知中心</div> <div class>
<a-breadcrumb class="newBreadcrumb mt0 mb16">
<a-breadcrumb-item href>
<router-link :to="{name:'merchantBack'}">
<a-icon type="home" />
</router-link>
</a-breadcrumb-item>
<a-breadcrumb-item>
<span @click="cancelAdd" v-if="secondBreadcrumb" style="cursor:pointer">通知中心</span>
<span v-else>通知中心</span>
</a-breadcrumb-item>
<a-breadcrumb-item v-if="secondBreadcrumb">{{secondBreadcrumb}}</a-breadcrumb-item>
</a-breadcrumb>
<div class="contentbody bodyContainer">
<div class>
<div class="searchbox pb12 ml12 mr12">
<div class="searchinput">
<a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
<!-- <a-icon slot="prefix" type="search" class="cccc" /> -->
<!-- <a-button slot="enterButton" class="cblue">搜索</a-button> -->
</a-input-search>
</div>
<!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
</div>
</div>
</div>
</div>
</template> </template>
<script> <script>
@ -13,7 +39,7 @@ export default {
// 组件状态值 // 组件状态值
data() { data() {
return { return {
secondBreadcrumb: '',
} }
}, },
// 计算属性 // 计算属性
@ -26,7 +52,6 @@ export default {
*/ */
created() { created() {
this.$emit('setTitle', '通知中心') this.$emit('setTitle', '通知中心')
}, },
/** /**
* el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@ -34,10 +59,9 @@ export default {
*/ */
mounted() {}, mounted() {},
// 组件方法 // 组件方法
methods: {} methods: {},
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
</style> </style>

2
src/components/merchantManagement/roleManagement.vue
Unescape Escape View File

@ -57,7 +57,7 @@
<a-form-item> <a-form-item>
<div class> <div class>
在 在
<a-select default-value="lucy" class="mr8 ml8" style="width:360px" placeholder="请选择分组" v-decorator="['agencyTeamId',{ rules: [{ required: false, message: '请选择分组' }] },]" dropdownClassName="groupSelectDrop"> <a-select default-value="lucy" class="mr8 ml8" style="width:360px" placeholder=" 请在已有的角色选择" v-decorator="['agencyTeamId',{ rules: [{ required: false, message: ' 请在已有的角色选择' }] },]" dropdownClassName="groupSelectDrop">
<a-select-option :value="item.roleName" v-for="(item,index) in roleList">{{item.roleName}}</a-select-option> <a-select-option :value="item.roleName" v-for="(item,index) in roleList">{{item.roleName}}</a-select-option>
<!-- <div slot="dropdownRender" slot-scope="menu"> <!-- <div slot="dropdownRender" slot-scope="menu">
<div v-for="(item,index) in roleList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index"> <div v-for="(item,index) in roleList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index">

17
src/components/userinfo/usercenter/components/dataStatistics.vue
Unescape Escape View File

@ -12,10 +12,10 @@
<div class="bodyContainer contentbody"> <div class="bodyContainer contentbody">
<div class="leftContainer pb24"> <div class="leftContainer pb24">
<div class="searchbox pb12 ml12 mr12"> <div class="searchbox pb12 ml12 mr12">
<div class> <div class="searchinput">
<a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"> <a-input-search placeholder="搜索成员" v-model.trim="pagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
<a-icon slot="prefix" type="search" class="cccc" /> <!-- <a-icon slot="prefix" type="search" class="cccc" />
<a-button slot="enterButton" class="cblue">搜索</a-button> <a-button slot="enterButton" class="cblue">搜索</a-button>-->
</a-input-search> </a-input-search>
</div> </div>
<!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> --> <!-- <i class="iconfont icon-fangda ml12 c6 curp" @click="[addGroupShow = true,isEdit = false]" style="line-height:32px"></i> -->
@ -148,10 +148,10 @@
</div> </div>
<a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose> <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
<div slot="title" destoryOnClose>明细</div> <div slot="title" destoryOnClose>明细</div>
<div class="searchinput"> <div class="searchinput mb16">
<a-input-search placeholder="请输入老乡姓名" v-model.trim="billPagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch"> <a-input-search placeholder="请输入老乡姓名" v-model.trim="billPagination.keys" allowClear @search="onSearch" @keyup.enter="onSearch" @input="resetsearch">
<a-icon slot="prefix" type="search" class="cccc" /> <!-- <a-icon slot="prefix" type="search" class="cccc" />
<a-button slot="enterButton" class="cblue">搜索</a-button> <a-button slot="enterButton" class="cblue">搜索</a-button>-->
</a-input-search> </a-input-search>
<!-- <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys"> <!-- <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model.trim="billPagination.keys">
<i slot="prefix" class="iconfont icon-sousuo"></i> <i slot="prefix" class="iconfont icon-sousuo"></i>
@ -990,6 +990,9 @@ table {
/deep/ .searchbox { /deep/ .searchbox {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.searchinput {
width: 100%;
}
// padding-bottom: 14px; // padding-bottom: 14px;
} }
.leftMenu { .leftMenu {
@ -1181,7 +1184,7 @@ td:empty:before {
} }
/deep/.searchinput { /deep/.searchinput {
width: 326px; width: 326px;
margin-bottom: 16px; // margin-bottom: 16px;
position: relative; position: relative;
} }

7
src/style/index.less
Unescape Escape View File

@ -281,7 +281,7 @@ i {
margin-left: 6px; margin-left: 6px;
} }
.ml4 { .ml4 {
margin-left: 4px; margin-left: 4px !important;
} }
.mr6 { .mr6 {
margin-right: 6px; margin-right: 6px;
@ -724,7 +724,7 @@ i {
border-radius: 4px; border-radius: 4px;
text-align: center; text-align: center;
box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4); box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
padding: 0 16px 10px 16px; padding: 0 12px 10px 16px;
> div { > div {
padding: 16px; padding: 16px;
text-align: center; text-align: center;
@ -737,6 +737,7 @@ i {
display: flex; display: flex;
padding: 12px 0; padding: 12px 0;
font-size: 14px; font-size: 14px;
align-items: center;
// font-weight: bold; // font-weight: bold;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
@ -762,7 +763,7 @@ i {
border-radius: 17px; border-radius: 17px;
color: #1890ff; color: #1890ff;
font-size: 14px; font-size: 14px;
line-height: 32px; line-height: 30px;
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
&:hover { &:hover {

Write Preview
Loading…
Cancel
Save