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

代码同步

Browse Source
cyl/dev
wangxia 2 years ago
parent 6d3ded654b
commit ce8466a73f
20 changed files with 76 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">代理列表-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">佣金配置-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -68,7 +68,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.data_container { .data_container {
height: 100%; height: 100%;
padding: 16px; // padding: 16px;
} }
.bodyContainer { .bodyContainer {

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">企业信息-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">后台首页-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">通讯录-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">职位列表-页面正在建设中…</div>
</div> </div>
</div> </div>

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

@ -1052,7 +1052,7 @@ export default {
// margin-top: 16px; // margin-top: 16px;
// min-height: calc(100vh - 200px); // min-height: calc(100vh - 200px);
height: 100%; height: 100%;
padding: 16px; // padding: 16px;
// background-color: #fff; // background-color: #fff;
border: 1px solid #0000; border: 1px solid #0000;
} }

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">我的账单-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">导航配置-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">工单列表-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">企微配置-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">服务市场-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@
<svg class="svg_icon f320" aria-hidden="true"> <svg class="svg_icon f320" aria-hidden="true">
<use xlink:href="#icon-yemianjianshezhong" /> <use xlink:href="#icon-yemianjianshezhong" />
</svg> </svg>
<div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div> <div class="f14 c9" style="transform:translateY(-30px)">老乡列表-页面正在建设中…</div>
</div> </div>
</div> </div>
</div> </div>

2
src/components/userinfo/accountsetting/components/bocaiTV.vue
Unescape Escape View File

@ -131,7 +131,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.bocaiTV-container { .bocaiTV-container {
padding: 16px; // padding: 16px;
} }
.icon { .icon {
width: 1em; width: 1em;

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

@ -193,7 +193,7 @@
import { getMemberGroupApi, dataStatisticsTeamDetailApi, dataStatisticsListApi } from '../../../../api/merchantConfig' import { getMemberGroupApi, dataStatisticsTeamDetailApi, dataStatisticsListApi } from '../../../../api/merchantConfig'
import moment from 'moment' import moment from 'moment'
import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth, fullCopy } from '../../../../utils/commonUtil' import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth, fullCopy, setReturnFee } from '../../../../utils/commonUtil'
const rowSelection = { const rowSelection = {
onChange: (selectedRowKeys, selectedRows) => { onChange: (selectedRowKeys, selectedRows) => {
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows) console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@ -564,6 +564,18 @@ export default {
return row.applyUserName return row.applyUserName
}, },
}, },
{
title: '服务费',
dataIndex: 'returnFee',
key: 'returnFee',
ellipsis: true,
width: 80,
// slots: { title: 'applyUserName' },
customRender: (text, row, index) => {
// console.log(row);
return setReturnFee(row.returnFee, row.returnFeeType)
},
},
{ {
title: '入职绩点', title: '入职绩点',
dataIndex: 'entryGPA', dataIndex: 'entryGPA',
@ -1079,7 +1091,7 @@ table {
.dataStatisticsContainer { .dataStatisticsContainer {
height: 100%; height: 100%;
padding: 16px; // padding: 16px;
// min-height: 780px; // min-height: 780px;
} }
.contentbody { .contentbody {

33
src/router/index.js
Unescape Escape View File

@ -233,7 +233,7 @@ const routes = [
name: "largeScreen", name: "largeScreen",
component: () => import("../components/screen/largeScreen.vue"), component: () => import("../components/screen/largeScreen.vue"),
// component: resolve => require(['../components/FirstJob/joblist.vue'],resolve) // component: resolve => require(['../components/FirstJob/joblist.vue'],resolve)
},{ }, {
path: "/largeScreen1", path: "/largeScreen1",
name: "largeScreen1", name: "largeScreen1",
component: () => import("../components/screen/largeScreen1.vue"), component: () => import("../components/screen/largeScreen1.vue"),
@ -312,23 +312,19 @@ const routes = [
component: () => import("../views/merchantBack.vue"), component: () => import("../views/merchantBack.vue"),
children: [ children: [
// 团队成员
{ {
path: "memberInfo", path: "memberInfo",
name: "MemberInfo", name: "MemberInfo",
component: () => import("../components/merchantManagement/memberInfo.vue"), component: () => import("../components/merchantManagement/memberInfo.vue"),
}, },
// 团队数据
{ {
path: "dataStatistics", path: "dataStatistics",
name: "DataStatistics", name: "DataStatistics",
component: () => import("../components/userinfo/usercenter/components/dataStatistics.vue"), component: () => import("../components/userinfo/usercenter/components/dataStatistics.vue"),
}, },
{
path: "bocaiTV",
name: "BocaiTV",
component: () => import(
"../components/userinfo/accountsetting/components/bocaiTV.vue"
),
},
// 数据大屏 // 数据大屏
{ {
path: "dataScreen", path: "dataScreen",
@ -359,12 +355,7 @@ const routes = [
name: "WorkBench", name: "WorkBench",
component: () => import("../components/merchantManagement/workBench.vue"), component: () => import("../components/merchantManagement/workBench.vue"),
}, },
// 通知中心
{
path: "notificationCenter",
name: "NotificationCenter",
component: () => import("../components/merchantManagement/notificationCenter.vue"),
},
// 后台首页 // 后台首页
{ {
path: "homePage", path: "homePage",
@ -413,6 +404,20 @@ const routes = [
name: "MineBill", name: "MineBill",
component: () => import("../components/merchantManagement/mineBill.vue"), component: () => import("../components/merchantManagement/mineBill.vue"),
}, },
// 通知中心
{
path: "notificationCenter",
name: "NotificationCenter",
component: () => import("../components/merchantManagement/notificationCenter.vue"),
},
// TV配置
{
path: "bocaiTV",
name: "BocaiTV",
component: () => import(
"../components/userinfo/accountsetting/components/bocaiTV.vue"
),
},
// 企微配置 // 企微配置
{ {
path: "qiwei", path: "qiwei",

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

@ -495,7 +495,7 @@ i {
} }
.bodyContainer { .bodyContainer {
padding: 16px; padding: 16px;
min-height: calc(100vh - 170px); min-height: calc(100vh - 194px);
// height: 97%; // height: 97%;
background-color: #fff; background-color: #fff;
} }

27
src/utils/commonUtil.js
Unescape Escape View File

@ -1114,7 +1114,32 @@ export function userApplyOrderStatusArray () {
]; ];
return orderStatus; return orderStatus;
} }
/**
* 获取服务费类型
*/
export function setReturnFee (returnFee, returnFeeType) {
console.log(returnFee);
console.log(returnFeeType);
let servetype
if (returnFeeType === 0) {
servetype = `${returnFee / 100 || "--"}元/小时`;
} else if (returnFeeType === 1) {
servetype = `${returnFee / 100 || "--"}元/日`;
} else if (returnFeeType === 2) {
servetype = `${returnFee / 100 || "--"}元/月`;
} else if (returnFeeType === 3) {
servetype = `${returnFee / 100 || "--"}元/次`;
} else if (returnFeeType === 4) {
servetype = `${returnFee / 100 || "--"}元/件`;
} else if (returnFeeType === 5) {
servetype = `工人收入${returnFee / 100 || "--"}%`;
} else if (returnFeeType === 6) {
servetype = `共${returnFee / 100 || "--"}元`;
} else if (returnFeeType === 7) {
servetype = `费用待定`;
}
return servetype
}
/** /**
* 根据工单状态ID获取名称 我的老乡 * 根据工单状态ID获取名称 我的老乡
*/ */

2
src/views/merchantBack.vue
Unescape Escape View File

@ -670,7 +670,7 @@ header.header,
.trans { .trans {
-webkit-transition: all 0.2s; -webkit-transition: all 0.2s;
// height: calc(100vh - 64px); // height: calc(100vh - 64px);
min-height: calc(100vh - 64px); // min-height: calc(100vh - 64px);
overflow: hidden; overflow: hidden;
background-color: #f0f2f5; background-color: #f0f2f5;
transition: all 0.2s; transition: all 0.2s;

Write Preview
Loading…
Cancel
Save