Skip to content

C
confucius
Commit cd4cca53 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 9333b10a c12a66d3
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 34 deletions
src/App.vue
View file @ cd4cca53
......@@ -20,7 +20,7 @@ export default {
</script>
<style>
@import url("//at.alicdn.com/t/font_2077629_14lp3cy4cqf.css");
@import url("//at.alicdn.com/t/font_2077629_dvjvubdhonm.css");
.q-scrollarea__thumb {
z-index: 999999 !important;
}
......
src/components/enterprise/chaneelcode-form.vue
View file @ cd4cca53
......@@ -119,10 +119,10 @@
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select>
<div style="max-width: 320px;">
<div>
<div style="line-height: 20px;">
<span v-if="x.EmpList.length>0" v-for="(item,index) in x.EmpList " :key="index">{{item.DeptName}}{{x.EmpList.length-1 !=index?'、':''}}</span>
</div>
<el-button @click="outerVisible=true,outerindex=y,byval=x.EmpList">选择企业成员</el-button>
<el-button @click="outerVisible=true,outerindex=y,byval=x.EmpList" style="margin-top: 0;">选择企业成员</el-button>
</div>
</div>
<div>
......@@ -138,10 +138,13 @@
</el-form-item>
<el-form-item label="适用周期：">
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
<div style="line-height: 40px;">
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in weekList" :key='index'
@click=" weekList[index].chek = !weekList[index].chek,$forceUpdate()"
:style="{background:item.chek?'#1890ff':'#FFF'}">{{item.Name}}</span>
</div>
</el-form-item>
</el-form>
</q-card-section>
......
src/components/enterprise/material/allmaterial.vue
View file @ cd4cca53
......@@ -63,7 +63,7 @@
</q-tooltip>
</q-icon>
<q-icon v-if="(props.row.Type==2 || props.row.Type==4 || props.row.Type==5 || props.row.Type==6 || props.row.Type==7)&& props.row.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" style="margin-left: 10px;" >
size="20px" name="iconfont icon-weiwancheng" color="red" style="margin-left: 10px;" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/material/appletmaterial.vue
View file @ cd4cca53
......@@ -36,7 +36,7 @@
</q-icon>
<q-icon
v-if="x.Media_Id==''" class="absolute all-pointer-events"
size="22px" name="iconfont icon-yiquxiao" color="red" style="top: 8px; right: 8px">
size="22px" name="iconfont icon-weiwancheng" color="red" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/material/audiomaterial.vue
View file @ cd4cca53
......@@ -28,7 +28,7 @@
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
size="20px" name="iconfont icon-weiwancheng" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/material/filematerial.vue
View file @ cd4cca53
......@@ -28,7 +28,7 @@
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
size="20px" name="iconfont icon-weiwancheng" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/material/imgmaterial.vue
View file @ cd4cca53
......@@ -38,7 +38,7 @@
</q-icon>
<q-icon
v-if="x.Media_Id==''" class="absolute all-pointer-events"
size="20px" name="iconfont icon-yiquxiao" color="red" style="top: 8px; right: 8px">
size="20px" name="iconfont icon-weiwancheng" color="red" style="top: 8px; right: 8px">
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/material/videomaterial.vue
View file @ cd4cca53
......@@ -27,7 +27,7 @@
</q-icon>
<q-icon
v-if="x.Media_Id==''"
size="20px" name="iconfont icon-yiquxiao" color="red" >
size="20px" name="iconfont icon-weiwancheng" color="red" >
<q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
未更新
</q-tooltip>
......
src/components/enterprise/welcome-from.vue
View file @ cd4cca53
......@@ -134,7 +134,7 @@
<q-btn color="accent" label="+插入客户名称" size='sm' class="q-mr-md" @click='insert' />
</div>
</el-form-item>
<el-form-item label="添加内容：">
<el-form-item label="添加内容：" style="margin-bottom: 20px;">
<div v-if="addMsg.MediumModel && addMsg.MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y">
<i class="el-icon-link"></i>
......
src/components/exam/exampaperlist.vue
View file @ cd4cca53
......@@ -2,6 +2,12 @@
.examForm .q-table__bottom {
min-height: 10px;
}
.greenStyle{
color:green;
}
.color_shz{color: #1273BC}
.color_tg{color: #4BCA81}
.color_bh{color: #c94052}
</style>
<template>
......@@ -22,9 +28,9 @@
</template>
</div>
<div>
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
<q-btn v-if="multipleSelection&&multipleSelection.length>0&&IsMovePaper" color="accent" size="sm" class="q-mr-md"
@click="movePaperFile()" label="移动到" />
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
<q-btn v-if="multipleSelection&&multipleSelection.length>0&&IsDelPaper" color="accent" size="sm" class="q-mr-md"
label="删除" @click="batchDelete()" />
</div>
</div>
......@@ -100,14 +106,20 @@
</template>
<template v-slot:body-cell-ExamineStatusStr="props">
<q-td :props="props">
<el-popover
placement="bottom"
title="驳回原因"
width="350"
trigger="hover"
:content='props.row.ExamineRemark'>
<span slot="reference">{{props.row.ExamineStatusStr}}</span>
</el-popover>
<template v-if="props.row.ExamineStatus==4||props.row.ExamineStatus==3">
<el-popover
placement="bottom"
title="驳回原因"
width="350"
trigger="hover"
:content='props.row.ExamineRemark'>
<span slot="reference" class="color_bh">{{props.row.ExamineStatusStr}}</span>
</el-popover>
</template>
<template v-else>
<span :class="{'color_tg':props.row.ExamineStatus==2||props.row.ExamineStatus==5,
'color_bh':props.row.ExamineStatus==6}">{{props.row.ExamineStatusStr}}</span>
</template>
</q-td>
</template>
<template v-slot:body-cell-PaperType="props">
......@@ -226,6 +238,8 @@
MoveIds: '',
currentUserInfo: {}, //当前登录用户
IsPaperManager: false,
IsMovePaper: false, //是否可以移动文件
IsDelPaper: false, //是否删除试卷
pageMsg: {
rowsPerPage: 10,
},
......@@ -289,6 +303,12 @@
if (x.FunctionCode == "Paper_Manager") { //判断是否是试卷管理员
this.IsPaperManager = true;
}
if (x.FunctionCode == "Paper_Move"){ //判断是否有移动文件权限
this.IsMovePaper = true;
}
if (x.FunctionCode == "Paper_Delete"){ //判断是否有删除文件夹权限
this.IsDelPaper = true;
}
})
},
mounted() {},
......
src/pages/course/examPaper.vue
View file @ cd4cca53
......@@ -64,6 +64,19 @@
<q-select @input="refreshPage" clearable filled v-model="msg.QExamineStatus" :options="auditStatusList"
emit-value map-options label="审核状态" />
</div>
<div class="col-3">
<q-select v-model="msg.QCreateBy"
:options="EmployeeList" filled use-input label="创建人" @input="refreshPage" clearable option-label="EmployeeName" option-value="Id"
ref="EmployeeName" class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
</div>
</div>
<div class="page-option">
<q-btn color="accent" size="sm" v-if="IsCreateFolder" class="q-mr-md" label="新增文件夹"
......@@ -96,6 +109,9 @@
import {
GetPaperPage
} from '../../api/teacher/index';
import {
queryEmployee
} from '../../api/users/user'; //获取员工
//获取校区列表
export default {
components: {
......@@ -116,6 +132,7 @@
QStartTime: "", //开始时间
QEndTime: "", //结束时间
QExamineStatus: '', //审核状态
QCreateBy:'' //创建人
},
pageCount: 0,
loading: false,
......@@ -146,6 +163,8 @@
label: "作废"
}
],
EmployeeList: [], //员工列表
AllemployeeList: [], //所有员工列表
}
},
created() {
......@@ -161,9 +180,38 @@
})
},
mounted() {
this.getEmployee();
this.getList();
},
methods: {
//筛选员工
filterFn(val, update) {
update(() => {
if (val === '') {
this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList))
} else {
const needle = val.toLowerCase();
this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1);
}
})
},
//获取业务员
getEmployee() {
var qMsg = {
Dept_Id: 0
}
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.EmployeeList = res.Data;
this.AllemployeeList = res.Data;
let obj = {
Id: 0,
EmployeeName: '不限'
}
this.EmployeeList.unshift(obj);
}
})
},
//翻页
changePage(val) {
this.msg.pageIndex = val;
......
src/pages/enterprise/addchannelcode.vue
View file @ cd4cca53
......@@ -25,6 +25,7 @@
.addchannelcode .tag-content {
flex: 1;
margin-left: 20px;
line-height: 32px;
}
.addchannelcode .tag-content .ant-tag {
......@@ -134,7 +135,7 @@
<ul v-if="Lableshow == false">
<li class="tag-item" v-for="(x,y) in LableList" :key='y'>
<el-tag effect="plain" style="min-width: 70px;text-align: center;overflow: hidden;"> {{ x.Name }} </el-tag>
<div class="tag-content">
<div class="tag-content" >
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in x.ChildList" :key='index'
@click="LableList[y].ChildList[index].chek = !LableList[y].ChildList[index].chek,$forceUpdate()"
......@@ -144,7 +145,7 @@
</ul>
<ul v-if="Lableshow == true">
<li class="tag-item" v-for="(x,y) in LableList" :key='y' v-if="y<5">
<el-tag effect="plain"> {{ x.Name }} </el-tag>
<el-tag effect="plain" style="min-width: 70px;text-align: center;overflow: hidden;"> {{ x.Name }} </el-tag>
<div class="tag-content">
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in x.ChildList" :key='index'
......@@ -257,14 +258,15 @@
</el-option>
</el-select>
<div style="flex:1;width: 1px;margin-top: 3px;" v-if="addMsg.Type==2">
<div v-if="item.EmpList.length>0">
<div v-if="item.EmpList.length>0" style="line-height:20px" >
<span v-for="(c,v) in item.EmpList "
:key="v">{{c.DeptName}}{{item.EmpList.length-1
!=v?'、':''}}</span>
</div>
<div style="display: flex;align-items: center;">
<el-button
@click="outerVisible=true,outerindex0=y,outerindex=index,byval=item.EmpList"
@click="outerVisible=true,outerindex0=y,outerindex=index,byval=item.EmpList"
style="margin-top: 0;"
size="small">选择企业成员</el-button>
<q-btn flat color="red" v-if="item.IsDefault!=1" label="删除"
@click="spweeklist[y].list.splice(index,1),getalluser()" />
......@@ -295,7 +297,7 @@
</el-form-item>
</el-form>
</div>
<q-btn color="primary" label="添加时期" icon='add' size='sm' @click="addalldata()" />
<q-btn color="primary" label="添加时期" icon='add' size='sm' style="margin-top: 10px;" @click="addalldata()" />
</div>
</el-form-item>
......@@ -321,7 +323,7 @@
<q-select v-if="addMsg.Type==1" style="width: 60%;" filled stack-label option-value="Id" option-label="EmployeeName" v-model="addMsg.EmpBackUp"
ref="Id" :options="Employeelist" label="备用员工" :dense="false" emit-value map-options />
<div style="width: 60%;">
<div style="width: 100%;display: flex;flex-wrap: wrap;" v-if="EmpBackUpList.length>0">
<div style="width: 100%;display: flex;flex-wrap: wrap;line-height: 20px;" v-if="EmpBackUpList.length>0">
<span v-for="(c,v) in EmpBackUpList "
:key="v">{{c.DeptName}}{{EmpBackUpList.length-1
!=v?'、':''}}</span>
......@@ -380,8 +382,12 @@
</div>
</el-form-item>
</el-form>
<div style="width: 100%;text-align: right;">
<q-btn color="accent" class="q-mr-md" size="sm" label="新增" @click="handleTabsEdit()" v-if="addMsg.WelcomeWeekEnable==1"/>
</div>
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeWeekEnable==1">
<el-tabs v-model="editableTabsValue" type="card" addable @edit="handleTabsEdit" style="width: 1px;flex:1">
<el-tabs v-model="editableTabsValue" type="card" style="width: 1px;flex:1">
<el-tab-pane
:key="index"
v-for="(item, index) in wwlist"
......@@ -437,8 +443,11 @@
</div>
</el-form-item>
</el-form>
<div style="width: 100%;text-align: right;">
<q-btn color="accent" class="q-mr-md" size="sm" label="新增" @click="handleTabsEdit2()" v-if="addMsg.WelcomeSpecialEnable==1"/>
</div>
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeSpecialEnable==1">
<el-tabs v-model="editableTabsValue2" type="card" addable @edit="handleTabsEdit2" style="width: 1px;flex:1">
<el-tabs v-model="editableTabsValue2" type="card" style="width: 1px;flex:1">
<el-tab-pane
:key="index"
v-for="(item, index) in wsplist"
......@@ -1542,27 +1551,30 @@
this.$forceUpdate()
},
handleTabsEdit(targetName, action){
if(action=='add'){
this.wwlist.push({weeklist:[{ Id: 1, Name: '周一', chek: false }, { Id: 2, Name: '周二', chek: false }, { Id: 3, Name: '周三', chek: false }, { Id: 4, Name: '周四', chek: false }, { Id: 5, Name: '周五', chek: false }, { Id: 6, Name: '周六', chek: false }, { Id: 0, Name: '周日', chek: false }],
childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}]
})
this.$forceUpdate();
}
},
handleTabsEdit2(targetName, action){
if(action=='add'){
this.wsplist.push({StartDate:'',EndDate:'', value:[],childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}] })
this.$forceUpdate();
}
},
handleTabsclose(index,type=1){
let that = this;
if(type==1){//周期
that.wwlist.splice(index,1)
that.editableTabsValue='0'
this.wwlist.sort()
}else{//特殊
that.wsplist.splice(index,1)
that.editableTabsValue2='0'
this.wsplist.sort()
}
......
src/pages/enterprise/materialManage.vue
View file @ cd4cca53
......@@ -14,7 +14,7 @@
<div class="col-6" style="color: red;display: flex;">
注：更新为整点更新到企业微信
(<span>
<i class="iconfont icon-yiquxiao" style="font-size: 14px;color: red;"></i>
<i class="iconfont icon-weiwancheng" style="font-size: 14px;color: red;"></i>
未更新
<i class="iconfont icon-yiqueren" style="font-size: 14px;color: green;"></i>
已更新
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment