Skip to content

C
confucius
Commit abf987c1 authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	src/App.vue
parents 0b9db68b 73aa9149
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 38 deletions
package.json
View file @ abf987c1
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"ali-oss": "^6.12.0", "ali-oss": "^6.12.0",
"axios": "^0.18.1", "axios": "^0.18.1",
"browser-md5-file": "^1.0.0", "browser-md5-file": "^1.1.1",
"co": "^4.6.0", "co": "^4.6.0",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"cos-js-sdk-v5": "^1.1.5", "cos-js-sdk-v5": "^1.1.5",
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"relation-graph": "^1.0.8", "relation-graph": "^1.0.8",
"v-viewer": "^1.5.1", "v-viewer": "^1.5.1",
"vue-amap": "^0.5.10", "vue-amap": "^0.5.10",
"vue-draggable-resizable": "^1.7.2", "vue-draggable-resizable": "^1.7.5",
"vue-easytable": "^1.7.2", "vue-easytable": "^1.7.2",
"vue-i18n": "^8.0.0", "vue-i18n": "^8.0.0",
"vue-inline-svg": "^2.0.0", "vue-inline-svg": "^2.0.0",
......
src/components/schedul/schedul-orderlist.vue
View file @ abf987c1
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
padding-right:10px; padding-right: 10px;
} }
.sche_List_in { .sche_List_in {
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
align-items: center; align-items: center;
height: 25px; height: 25px;
position: absolute; position: absolute;
bottom:10px; bottom: 10px;
width:100%; width: 100%;
right:0; right: 0;
} }
.tufa_xiugai { .tufa_xiugai {
...@@ -245,10 +245,12 @@ ...@@ -245,10 +245,12 @@
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent)); -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae; background-color: #0ae;
} }
.OtherListContent{
height:135px; .OtherListContent {
height: 135px;
overflow: auto; overflow: auto;
} }
.OtherListContent::-webkit-scrollbar { .OtherListContent::-webkit-scrollbar {
width: 3px; width: 3px;
height: 3px; height: 3px;
...@@ -320,15 +322,15 @@ ...@@ -320,15 +322,15 @@
v-for="(item,index) in WorkObj.FileList"> v-for="(item,index) in WorkObj.FileList">
<el-image :src="item" style="width:100%;height:100%;" :preview-src-list="WorkObj.FileList"> <el-image :src="item" style="width:100%;height:100%;" :preview-src-list="WorkObj.FileList">
</el-image> </el-image>
<template v-if="workAuthObj.isShowEditAndDelete"> <template v-if="workAuthObj.isShowEditAndDelete">
<i class="iconfont icon-yiquxiao sch_del" style="font-size:17px;top:-4px;" <i class="iconfont icon-yiquxiao sch_del" style="font-size:17px;top:-4px;"
@click="workRemoveAdd(index)"></i> @click="workRemoveAdd(index)"></i>
</template> </template>
</div> </div>
</template> </template>
<template v-if="workAuthObj.isShowEditAndDelete&&WorkObj.ItemImgList&&WorkObj.ItemImgList.length>0"> <template v-if="workAuthObj.isShowEditAndDelete&&WorkObj.ItemImgList&&WorkObj.ItemImgList.length>0">
<el-upload class="schedul_Upload MyUpload" style="display:inline;" action="" list-type="picture-card" <el-upload class="schedul_Upload MyUpload" style="display:inline;" action=""
:show-file-list="false" :http-request="UploadWorkFile"> list-type="picture-card" :show-file-list="false" :http-request="UploadWorkFile">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
</template> </template>
...@@ -338,7 +340,8 @@ ...@@ -338,7 +340,8 @@
<template v-if="WorkObj.ItemType==2"> <template v-if="WorkObj.ItemType==2">
<div style="margin:10px 0;"> <div style="margin:10px 0;">
<template v-if="workAuthObj.isShowEditAndDelete"> <template v-if="workAuthObj.isShowEditAndDelete">
<span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改" @click="isShowSure=true">{{WorkObj.WorkContent}}</span> <span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改"
@click="isShowSure=true">{{WorkObj.WorkContent}}</span>
<el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样"> <el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样">
</el-input> </el-input>
</template> </template>
...@@ -353,12 +356,13 @@ ...@@ -353,12 +356,13 @@
<div class="OtherListContent"> <div class="OtherListContent">
<div v-for="(item,index) in WorkRuleList"> <div v-for="(item,index) in WorkRuleList">
<div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div> <div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div>
<div v-if="item.ItemImgList&&item.ItemImgList.length>0" style="width:100%;display:flex;flex-wrap:wrap"> <div v-if="item.ItemImgList&&item.ItemImgList.length>0"
style="width:100%;display:flex;flex-wrap:wrap">
<div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;"> <div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;">
<el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList"> <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
</el-image> </el-image>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -370,8 +374,8 @@ ...@@ -370,8 +374,8 @@
<template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete"> <template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat v-if="WorkObj.IsChecked==0" dense style="margin-left:10px;" slot="reference" <q-btn color="primary" flat v-if="WorkObj.IsChecked==0" dense style="margin-left:10px;" slot="reference"
@click="saveOrder(1)" label="确认完成" /> @click="saveOrder(1)" label="确认完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)" <q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)" style="margin-left:10px;"
style="margin-left:10px;" class="schedu_red" label="取消完成" /> class="schedu_red" label="取消完成" />
</template> </template>
<template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete"> <template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat dense style="margin-left:10px;" v-if="isShowSure" slot="reference" <q-btn color="primary" flat dense style="margin-left:10px;" v-if="isShowSure" slot="reference"
...@@ -450,7 +454,7 @@ ...@@ -450,7 +454,7 @@
<el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList"> <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
</el-image> </el-image>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -559,7 +563,7 @@ ...@@ -559,7 +563,7 @@
<el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList"> <el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
</el-image> </el-image>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -678,12 +682,12 @@ ...@@ -678,12 +682,12 @@
Shift: 0, Shift: 0,
DutyMan: 0 DutyMan: 0
}, },
WorkActive:'1', WorkActive: '1',
TufaActive:'1', TufaActive: '1',
handActive:'1', handActive: '1',
WorkRuleList:[], WorkRuleList: [],
EmergenciesRuleList:[], EmergenciesRuleList: [],
HandoverRuleList:[] HandoverRuleList: [],
} }
}, },
watch: { watch: {
...@@ -716,7 +720,7 @@ ...@@ -716,7 +720,7 @@
getWorkList() { getWorkList() {
queryDutyWork_V2(this.qMsg).then(res => { queryDutyWork_V2(this.qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(res,'数据'); console.log(res, '数据');
this.HandoverList = res.Data.HandoverList; this.HandoverList = res.Data.HandoverList;
this.EmergenciesList = res.Data.EmergenciesList; this.EmergenciesList = res.Data.EmergenciesList;
this.WorkList = res.Data.WorkList; this.WorkList = res.Data.WorkList;
...@@ -735,7 +739,20 @@ ...@@ -735,7 +739,20 @@
} }
}); });
}, },
//获取突发和交接
getTufaHand() {
var obj = {
IsBurst:0,
IsHandover:0
}
if (this.EmergenciesList.length > 0) {
obj.IsBurst=1
}
if (this.HandoverList.length > 0) {
obj.IsHandover=1
}
return obj;
},
//初始化权限信息 //初始化权限信息
initAuth() { initAuth() {
if (this.authObj) { if (this.authObj) {
...@@ -825,11 +842,11 @@ ...@@ -825,11 +842,11 @@
}, },
//保存工作清单 //保存工作清单
saveOrder(type) { saveOrder(type) {
if(this.WorkObj.FileList==null){ if (this.WorkObj.FileList == null) {
this.WorkObj.FileList=[]; this.WorkObj.FileList = [];
} }
if(type==1){ if (type == 1) {
if(this.WorkObj.ItemImgList.length>0&&this.WorkObj.FileList.length==0){ if (this.WorkObj.ItemImgList.length > 0 && this.WorkObj.FileList.length == 0) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message: '请上传图片', message: '请上传图片',
...@@ -838,7 +855,7 @@ ...@@ -838,7 +855,7 @@
return return
} }
} }
this.WorkObj.IsChecked=type; this.WorkObj.IsChecked = type;
var saveWorkMsg = { var saveWorkMsg = {
Id: this.WorkObj.Id, //编号 Id: this.WorkObj.Id, //编号
PlanShift: this.saveObj.Shift, //值班班次 PlanShift: this.saveObj.Shift, //值班班次
......
src/pages/financial/lessonCostStatistics.vue 0 → 100644
View file @ abf987c1
This diff is collapsed.
src/pages/scheduling/scheduleBoard.vue
View file @ abf987c1
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<schedulHead :dataList="dataList"></schedulHead> <schedulHead :dataList="dataList"></schedulHead>
<div class="Sche_Bottom"> <div class="Sche_Bottom">
<template v-if="dataList.Status!=2"> <template v-if="dataList.Status!=2">
<schedulOrder :save-obj="msg"></schedulOrder> <schedulOrder :save-obj="msg" ref="schOrder"></schedulOrder>
<schedulVisit :save-obj="msg"></schedulVisit> <schedulVisit :save-obj="msg"></schedulVisit>
</template> </template>
<template v-else> <template v-else>
...@@ -273,6 +273,30 @@ ...@@ -273,6 +273,30 @@
</div> </div>
</div> </div>
</div> </div>
<q-dialog v-model="isShowTuFA" style="width:400px">
<q-card>
<q-card-section>
<div class="text-h6">值班交接</div>
</q-card-section>
<q-card-section class="q-pt-none">
<div class="q-gutter-sm" style="width:280px;" v-if="isShowOne">
<span style="position:relative;top:6px;">有无突发：</span>
<q-radio v-model="isHaveTufa" :val="2" label="有" />
<q-radio v-model="isHaveTufa" :val="1" label="无" />
</div>
<div class="q-gutter-sm" style="width:280px;" v-if="isShowTwo">
<span style="position:relative;top:6px;">有无交接：</span>
<q-radio v-model="isHaveHand" :val="2" label="有" />
<q-radio v-model="isHaveHand" :val="1" label="无" />
</div>
</q-card-section>
<q-card-actions align="right">
<q-btn flat label="确定" color="primary" @click="submitHand" />
</q-card-actions>
</q-card>
</q-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -306,6 +330,8 @@ ...@@ -306,6 +330,8 @@
Id: 0, Id: 0,
Shift: 0, Shift: 0,
Status: 0, //Status(1-值班打卡，2-交接打卡) Status: 0, //Status(1-值班打卡，2-交接打卡)
IsBurst:0, //突发
IsHandover:0 //交接
}, },
dataList: {}, dataList: {},
//是否显示访客操作按钮 //是否显示访客操作按钮
...@@ -317,8 +343,13 @@ ...@@ -317,8 +343,13 @@
workAuthObj: { workAuthObj: {
isShowAdd: false, //是否显示新增按钮【默认不显示】 isShowAdd: false, //是否显示新增按钮【默认不显示】
isShowEditAndDelete: false, //是否显示编辑和删除按钮【默认不显示】 isShowEditAndDelete: false, //是否显示编辑和删除按钮【默认不显示】
} },
isShowTuFA: false,
isHaveTufa:2, //是否有突发
isHaveHand:2, //是否有交接
isShowOne:false,
isShowTwo:false,
status:0
} }
}, },
created() { created() {
...@@ -344,11 +375,31 @@ ...@@ -344,11 +375,31 @@
}, },
//值班打卡或值班交接 //值班打卡或值班交接
SetDutyCheck(status) { SetDutyCheck(status) {
this.status = status;
this.checkMsg.IsBurst = this.$refs.schOrder.getTufaHand().IsBurst;
this.checkMsg.IsHandover = this.$refs.schOrder.getTufaHand().IsHandover;
//突发事件
if(this.$refs.schOrder.getTufaHand().IsBurst==0){
this.isShowOne=true;
this.isShowTuFA=true;
}
//交接工作
if(this.$refs.schOrder.getTufaHand().IsHandover==0){
this.isShowTwo=true;
this.isShowTuFA=true;
}
if(this.$refs.schOrder.getTufaHand().IsBurst>0&&this.$refs.schOrder.getTufaHand().IsHandover>0){
this.saveInfo()
}
},
//保存
saveInfo(){
let diaMsg=''; let diaMsg='';
if(status==1){ if(this.status==1){
diaMsg='是否确定值班打卡?' diaMsg='是否确定值班打卡?'
} }
if(status==2){ if(this.status==2){
diaMsg='是否确定值班交接?' diaMsg='是否确定值班交接?'
} }
this.$q.dialog({ this.$q.dialog({
...@@ -359,7 +410,7 @@ ...@@ -359,7 +410,7 @@
ok: "确定", ok: "确定",
cancel: "取消", cancel: "取消",
}).onOk(() => { }).onOk(() => {
this.checkMsg.Status = status; this.checkMsg.Status = this.status;
saveDutyCheck(this.checkMsg).then(res => { saveDutyCheck(this.checkMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.getList(); this.getList();
...@@ -383,8 +434,39 @@ ...@@ -383,8 +434,39 @@
}).onCancel(() => { }).onCancel(() => {
}); });
}, },
//确定是否有突发
submitHand(){
if(this.isHaveTufa==2){
this.$q.notify({
type: 'negative',
position: "top",
message: `请填写突发事件`
})
this.isShowTuFA = false;
return
}
if(this.isHaveHand==2){
this.$q.notify({
type: 'negative',
position: "top",
message: `请填写交接`
})
this.isShowTuFA = false;
return
}
if(this.isHaveTufa==1){
this.checkMsg.IsBurst=1;
this.saveInfo();
}
if(this.isHaveHand==1){
this.checkMsg.IsHandover=1;
this.saveInfo();
}
this.isShowTuFA = false;
},
//刷新父页面 //刷新父页面
refreshPage() { refreshPage() {
this.getList(); this.getList();
......
src/router/routes.js
View file @ abf987c1
...@@ -243,6 +243,11 @@ const routes = [{ ...@@ -243,6 +243,11 @@ const routes = [{
component: () => component: () =>
import("pages/financial/salesRules.vue") import("pages/financial/salesRules.vue")
}, },
{
path: "/financial/lessonCostStatistics", //课耗统计汇总表
component: () =>
import("pages/financial/lessonCostStatistics.vue")
},
{ {
path: "/financial/salesCommission", //提成周期列表 path: "/financial/salesCommission", //提成周期列表
component: () => component: () =>
......
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