menjin
/
renli-pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

Browse Source
master
wangxubin@yeah.net 3 years ago
parent 0fbefe5800 e7ef6de911
commit e37acf2133
17 changed files with 22187 additions and 416 deletions
Show Stats Download Patch File Download Diff File

1
build/webpack.prod.conf.js
Unescape Escape View File

@ -68,6 +68,7 @@ const webpackConfig = merge(baseWebpackConfig, {
? 'index.html'
: config.build.index,
template: 'index.html',
chunks: ['manifest', 'vendor', 'app'],
inject: true,
minify: {
removeComments: true,

10
config/index.js
Unescape Escape View File

@ -26,11 +26,8 @@ module.exports = {
assetsPublicPath: "/",
proxyTable: {
"/api": {
target: "http://192.168.31.127:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
<<<<<<< HEAD
=======
target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
//target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
>>>>>>> 3f5ca99cc1d57a252d815df7e6ef142866202fd5
// target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
// target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
// target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云
@ -49,12 +46,7 @@ module.exports = {
}
},
// Various Dev Server settingsss
<<<<<<< HEAD
host: "192.168.31.194", // can be overwritten by process.env.HOST
=======
host: "192.168.31.193", // can be overwritten by process.env.HOST
host: "192.168.31.35", // can be overwritten by process.env.HOST
>>>>>>> 3f5ca99cc1d57a252d815df7e6ef142866202fd5
port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,

BIN
dist.zip
View File

Binary file not shown.

22515
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
Unescape Escape View File

@ -39,7 +39,7 @@
"vue-print-nb": "^1.6.0",
"vue-router": "^3.0.1",
"vuex": "^3.5.1",
"webpack-dev-server": "^2.9.7"
"webpack-dev-server": "^2.9.6"
},
"devDependencies": {
"autoprefixer": "^7.1.2",

2
partten/partten.js
Unescape Escape View File

@ -1,5 +1,7 @@
// 手机号正则
export const phoneNum = /^((1)|(\\+861)|(861))[0-9]{10}$/;
// 邮箱正则
export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
// export const http = "https://www.decaisoft.com:443/";

13
src/components/staffList/admin/index.vue
Unescape Escape View File

@ -21,13 +21,19 @@
</el-table>
<div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
<el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
<el-button size="mini" type="primary" plain @click="(staffLists.push({brandNumber:'',staffName:'',ratio:0}))">增加</el-button>
<el-button size="mini" type="primary" plain @click="handleadd" :disabled='isTrue'>增加</el-button>
</div>
</div>
</template>
<script>
import { selectListType } from "@/api/eashier.js";
export default {
props:{
isTrue:{
type:Boolean,
default:false
}
},
data() {
return {
staffList: [], //选择员工数组
@ -39,6 +45,11 @@ export default {
};
},
methods: {
// 限制最多添加八个
handleadd(){
if(this.staffLists.length>=8) return this.$message({message: '最多只能添加八条',type: 'warning'});
this.staffLists.push({brandNumber:'',staffName:'',ratio:0})
},
rowClassName({ row, rowIndex }) {
row.index = rowIndex;
},

15
src/components/staffList/manager/index.vue
Unescape Escape View File

@ -26,8 +26,8 @@
</el-table>
<div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
<el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
<el-button size="mini" type="primary" plain
@click="(staffLists.push({ brandNumber: '', staffName: '', ratio: 0 }))">增加
<el-button size="mini" type="primary" plain :disabled='isTrue'
@click="handleadd">增加
</el-button>
</div>
</div>
@ -35,6 +35,12 @@
<script>
import { QuerCompetent } from "@/api/eashier.js";
export default {
props:{
isTrue:{
type:Boolean,
default:false
}
},
data() {
return {
staffList: [], //选择员工数组
@ -45,6 +51,11 @@ export default {
};
},
methods: {
// 限制最多添加八个
handleadd(){
if(this.staffLists.length>=8)return this.$message({message: '最多只能添加八条',type: 'warning'});
this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
},
rowClassName({ row, rowIndex }) {
row.index = rowIndex;
},

15
src/components/staffList/staff/index.vue
Unescape Escape View File

@ -25,8 +25,8 @@
</el-table>
<div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
<el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
<el-button size="mini" type="primary" plain
@click="(staffLists.push({ brandNumber: '', staffName: '', ratio: 0 }))">增加
<el-button size="mini" type="primary" plain :disabled='isTrue'
@click="handleadd">增加
</el-button>
</div>
</div>
@ -35,6 +35,12 @@
<script>
import { selectList } from "@/api/eashier.js";
export default {
props:{
isTrue:{
type:Boolean,
default:false
}
},
data() {
return {
staffList: [], //选择员工数组
@ -46,6 +52,11 @@ export default {
};
},
methods: {
// 限制最多添加八个
handleadd(){
if(this.staffLists.length>=8)return this.$message({message: '最多只能添加八条', type: 'warning'});
this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
},
rowClassName({ row, rowIndex }) {
row.index = rowIndex;
},

4
src/home/components/top_right.vue
Unescape Escape View File

@ -6,9 +6,9 @@
<div class="nwwest-roll" id="nwwest-roll">
<ul id="roll-ul" style="list-style:none;">
<li v-for="(item,index) in activityList" ref="rollul" :class="{anim:animate==true}" :key="index" @click="openPromotion(item,promotionDialog=true)">
＞＞＞ <div class="nwwest-roll-div"><span style="display: inline-block;" :title="item.promotionName">{{item.promotionName}} </span>
&gt;&gt;&gt; <div class="nwwest-roll-div"><span style="display: inline-block;" :title="item.promotionName">{{item.promotionName}} </span>
<div style="display: inline-block;" class="text-red text-price">{{item.saleMoney}}</div>
</div> <span>＜＜＜</span>
</div> <span>&lt;&lt;&lt;</span>
</li>
</ul>
</div>

8
src/layout/components/Emain.vue
Unescape Escape View File

@ -23,7 +23,7 @@
</div>
</div>
<div class="padding-top padding-left padding-right">
<transition name="el-fade-in-linear" mode="out-in">
<transition name="fade" mode="out-in">
<keep-alive>
<router-view />
</keep-alive>
@ -153,6 +153,12 @@ export default {
};
</script>
<style scoped>
.fade-enter-active, .fade-leave-active {
transition: all 0.6s;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}
.tags {
overflow: hidden;
padding-left: 20px;

4
src/layout/components/asider.vue
Unescape Escape View File

@ -656,6 +656,7 @@ export default {
route: "/managers",
index: "managers",
number: "4001200",
id:"100010008",
},
{
name: "管理层业绩",
@ -663,6 +664,7 @@ export default {
route: "/admins",
index: "admins",
number: "4001300",
id:"100010009",
},
{
@ -671,6 +673,7 @@ export default {
route: "/dept",
index: "dept",
number: "4001400",
id:"1000100010",
},
// {
// name: "员工工资",
@ -998,7 +1001,6 @@ export default {
},
},
created() {
console.log(this.$utils.getPermission(6001100))
var that = this;
let menuList = [...that.menuList];
setTimeout(() => {

2
src/pages/eashier/coursetorec/components/detail.vue
Unescape Escape View File

@ -45,7 +45,7 @@
</div>
<span class="text-bold padding-xs">员工</span>
<div class="into-table-width flex justify-center align-start flex-wrap padding-top">
<staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
<staffsles ref="staffsles" @staffslesData="staffslesData" :is-true='true'></staffsles>
</div>
</el-form>
</div>

1
src/pages/eashier/coursetorec/components/raiseList.vue
Unescape Escape View File

@ -46,7 +46,6 @@
<detail ref="detail" @detailData="detailData"></detail>
<span slot="footer" class="dialog-footer">
<el-button size="mini" type="primary" @click="dialogFormVisible = false">关闭</el-button>
</el-button>
</span>
</el-dialog>
</template>

6
src/pages/eashier/raiseReatment/components/detail.vue
Unescape Escape View File

@ -59,9 +59,9 @@
</div>
<span class="padding-left-sm ">员工/门店管理层/高管业绩</span>
<div class=" flex justify-center align-start flex-wrap padding-top">
<staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
<admin ref="admin" @adminData="adminData"></admin>
<manager ref="manager" @managerData="managerData"></manager>
<staffsles ref="staffsles" @staffslesData="staffslesData" :is-true="true"></staffsles>
<admin ref="admin" @adminData="adminData" :is-true="true"></admin>
<manager ref="manager" @managerData="managerData" :is-true="true"></manager>
</div>
</el-form>
</div>

3
src/pages/eashier/service/service.vue
Unescape Escape View File

@ -52,8 +52,7 @@
<div class="flex justify-start align-start ">
<div class="into-table-width">
<el-table style="margin-top:3px;" :data="list" max-height="650" ref="list" @row-click="rowClick"
:row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand"
row-key="index" stripe
:row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" stripe
:header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee', }">
<el-table-column type="expand">
<template slot-scope="scope">

2
src/pages/eashier/within/components/detail.vue
Unescape Escape View File

@ -47,7 +47,7 @@
</el-form-item>
</el-form>
<div class="text-center margin-left-lg padding-left">
<staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
<staffsles ref="staffsles" @staffslesData="staffslesData" :is-true="true"></staffsles>
</div>
<member ref="member" @memberData="memberData"></member>
<rec ref="rec" @recTypeData="recData"></rec>

Write Preview
Loading…
Cancel
Save