Skip to content

S
SuperMan
Commit e18c8a30 authored by 罗超's avatar 罗超
Browse files
Options

工作计划功能

parent 912cb4e1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1280 additions and 6 deletions
src/components/administrative/AssetsSystem/AssetsShenpi.vue
View file @ e18c8a30
......@@ -479,7 +479,7 @@ export default {
GoZcUrl(){
let url='';
if (!this.isOnline()) {
url="http://www.test.com:8080/#/Home";
url="http://testerp.oytour.com:8080/#/Home";
}else{
url="http://zcyx.oytour.com/#/Home";
}
......
src/components/index.vue
View file @ e18c8a30
......@@ -1965,7 +1965,7 @@ export default {
if(s.Type==7){
let url="";
if (!this.isOnline()) {
url="http://www.test.com:8081/#/";
url="http://testerp.oytour.com:8081/#/";
}else{
url="http://yx.oytour.com/#/";
}
......@@ -3611,7 +3611,7 @@ export default {
let ObjInfo=JSON.stringify(obj);
if (!this.isOnline()) {
// url="http://zcyx.oytour.com/#/Autologin?ObjInfo="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
url="http://www.test.com:8080/#/Autologin?token="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
url="http://testerp.oytour.com:8080/#/Autologin?token="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
}else{
url="http://zcyx.oytour.com/#/Autologin?ObjInfo="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
}
......
src/components/work/mywork.vue 0 → 100644
View file @ e18c8a30
This diff is collapsed.
src/components/work/workDetails.vue 0 → 100644
View file @ e18c8a30
<template>
<div>
<div style="margin:10px auto;">
<h3
v-if="d.w"
style="font-size:18px;border-bottom:1px solid #ddd;font-weight:400;font-family:pingfangR;padding-bottom:10px;"
>
<span class="circle" v-if="d.w.ExamineStatus==0||d.w.ExamineStatus==-1"></span>
<span class="circle green" v-else-if="d.w.Status==0"></span>
<span class="circle red" v-else-if="d.w.Status==1||d.w.Status==2"></span>
<span class="circle black" v-else-if="d.w.Status==3"></span>
<span style="margin-right:15px;">{{d.w.Title}}</span>
<el-tag v-if="d.w.Tags.length>0">{{d.w.Tags}}</el-tag>
</h3>
<div
v-if="d.w"
style="font-size:14px;font-family:pingfangR;margin: 10px 0;padding: 10px;background: #FFF;"
>{{d.w.Description}}</div>
<fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;">
<legend style="padding:0 10px; font-size:14px;">计划工时信息</legend>
<el-row :gutter="12">
<el-col :span="6">创建人：{{d.w.CreateName}}</el-col>
<el-col :span="6">创建日期：{{d.w.CreateDate}}</el-col>
<el-col :span="6">开始时间：{{d.w.BeginTime}}</el-col>
<el-col :span="6">截止时间：{{d.w.EndTime}}</el-col>
</el-row>
</fieldset>
<fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;">
<legend style="padding:0 10px; font-size:14px;">计划操作记录</legend>
<div v-if="d.w.ExamineStatus==1">
<el-card class="work-content green">
<h4>主管立项审核通过</h4>
<p>{{d.w.ExamineState}} 提交于 {{d.w.ExamineDate}}</p>
<div class="cont">{{d.w.ExamineRemark}}</div>
</el-card>
</div>
<div v-if="d.w.ExamineStatus==-1">
<el-card class="work-content red">
<h4>主管立项审核驳回</h4>
<p>{{d.w.ExamineState}} 提交于 {{d.w.ExamineDate}}</p>
<div class="cont">{{d.w.ExamineRemark}}</div>
</el-card>
</div>
<div v-for="(item, index) in d.p" :key="index">
<el-card class="work-content">
<h4>
进度更新:
<div style="width:120px;display: inline-block;margin-left: 15px;">
<el-progress
:text-inside="true"
:stroke-width="24"
:percentage="item.Progree"
status="success"
></el-progress>
</div>
</h4>
<p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p>
<div class="cont">{{item.Content}}</div>
<div class="attach">
<a href="http://baidu.com" target="_blank">附件：baidu.jpg</a>
</div>
</el-card>
</div>
<div v-if="d.w.FinishExamineStatus==1">
<el-card class="work-content green">
<h4>主管完结审核通过</h4>
<p>{{d.w.FinishExamineState}} 提交于 {{d.w.FinishExamineDate}}</p>
<div class="cont">{{d.w.FinishExamineRemark}}</div>
</el-card>
</div>
<div v-if="d.w.FinishExamineStatus==-1">
<el-card class="work-content red">
<h4>主管完结审核驳回</h4>
<p>{{d.w.FinishExamineState}} 提交于 {{d.w.FinishExamineDate}}</p>
<div class="cont">{{d.w.FinishExamineRemark}}</div>
</el-card>
</div>
</fieldset>
<fieldset v-if="isEaxmine && d.w && (d.w.ExamineStatus==0 || (d.w.Status>=2 && d.w.FinishExamineStatus==0))" style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:20px;">
<legend style="padding:0 10px; font-size:14px;">审批</legend>
<div style="margin-bottom:10px">
<el-radio v-model="radio" label="1">通过</el-radio>
<el-radio v-model="radio" label="-1">驳回</el-radio>
</div>
<div style="margin-bottom:10px">
<el-input
type="textarea"
:rows="4"
style="width:100%"
placeholder="请输入审批意见"
v-model="textarea">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
<button
class="normalBtn"
type="primary"
@click="goexamine"
>确认提交</button>
</div>
</fieldset>
<fieldset v-if="isUpdate && d.w && ((d.w.Status==0 && d.w.ExamineStatus==1) || d.w.Status==1)" style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:20px;">
<legend style="padding:0 10px; font-size:14px;">提交进度</legend>
<div style="margin-bottom:10px;">
<el-row :gutter="12">
<el-col :span="1"> 当前进度： </el-col>
<el-col :span="4"><el-slider v-model="progree" :min="d.w.Progree" :max="100" :step="1"></el-slider></el-col>
</el-row>
</div>
<div style="margin-bottom:10px">
<el-input
type="textarea"
:rows="4"
style="width:100%"
placeholder="请输入进度说明"
v-model="textarea2">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
<button
class="normalBtn"
type="primary"
@click="setprogress"
>确认提交</button>
</div>
</fieldset>
</div>
</div>
</template>
<script>
export default {
data() {
return {
d: {},
radio:"1",
isEaxmine:false,
isUpdate:false,
textarea:'',
textarea2:'',
progree:0
};
},
mounted() {
let id = this.$route.query.id;
this.isEaxmine=this.$route.query.examine?true:false;
this.isUpdate=this.$route.query.update?true:false;
this.init(id);
},
methods: {
init(id) {
this.apipost(
"user_post_GetWorkDetails",
{ id },
res => {
if (res.data.resultCode == 1) {
this.d = res.data.data;
this.progree=this.d.w.Progree;
} else {
this.$message.error(res.data.message);
}
},
null
);
},
setprogress(){
if(this.textarea2==""){
this.$message.error("请填写进度说明");
return;
}
this.apipost(
"user_post_SetWorkProcess",
{
pid:this.$route.query.id,
content:this.textarea2,
progree:this.progree,
attach:""
},
res => {
if (res.data.resultCode == 1) {
window.location.reload();
} else {
this.$message.error(res.data.message);
}
},
null
);
},
goexamine(){
if(this.textarea==""){
this.$message.error("请填写审批意见");
return;
}
this.apipost(
"user_post_SetWorkExamine",
{
id:this.$route.query.id,
content:this.textarea,
status:this.radio
},
res => {
if (res.data.resultCode == 1) {
window.location.reload();
} else {
this.$message.error(res.data.message);
}
},
null
);
}
}
};
</script>
<style scope>
.circle {
width: 20px;
height: 20px;
display: inline-block;
vertical-align: text-top;
background: grey;
border-radius: 20px;
margin-right: 5px;
}
.circle.red {
background: #fe4433;
}
.circle.green {
background: green;
}
.circle.black {
background: black;
}
.work-content {
margin-bottom: 20px;
}
.work-content h4 {
font-weight: 400;
font-size: 16px;
margin-bottom: 10px;
}
.work-content p {
font-size: 12px;
color: #ddd !important;
margin-bottom: 10px;
}
.work-content .cont {
font-size: 14px;
font-family: pingfangR;
}
.work-content.green {
color: #fff;
background: #67c23a;
}
.work-content.red {
color: #fff;
background: #f56c6c;
}
.work-content.red *,
.work-content.green * {
color: #fff !important;
}
.work-content * {
color: #333;
}
.work-content .attach{
margin-top: 10px;
}
.work-content .attach a{
color: #409EFF;
text-decoration: underline;
}
</style>
\ No newline at end of file
src/components/work/workManager.vue 0 → 100644
View file @ e18c8a30
This diff is collapsed.
src/plug/index.js
View file @ e18c8a30
......@@ -111,14 +111,14 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://127.0.0.1:8082";
let locationName = window.location.hostname;
let javaUrldo="";
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
domainUrl = "http://127.0.0.1:8082";
}
else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
......
src/router/config.js
View file @ e18c8a30
......@@ -4264,7 +4264,30 @@ export default {
title: '票务规则配置'
}
},
{
path: '/mywork',
name: 'mywork',
component: resolve => require(['@/components/work/mywork'], resolve),
meta: {
title: '我的工作计划'
},
},
{
path: '/workDetails',
name: 'workDetails',
component: resolve => require(['@/components/work/workDetails'], resolve),
meta: {
title: '工作计划详情'
},
},
{
path: '/workManager',
name: 'workManager',
component: resolve => require(['@/components/work/workManager'], resolve),
meta: {
title: '工作计划详情'
},
}
]
},
{
......
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