Skip to content

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

优化

parent 31f57bba
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 14 deletions
src/components/work/mywork.vue
View file @ 31ac4f86
...@@ -110,14 +110,15 @@ ...@@ -110,14 +110,15 @@
<th>开始时间</th> <th>开始时间</th>
<th>截止时间</th> <th>截止时间</th>
<th>创建时间</th> <th>创建时间</th>
<th>立项审批信息</th> <th>总经理审批</th>
<th>立项审批</th>
<th>当前进度</th> <th>当前进度</th>
<th>完成审批信息</th> <th>完成审批</th>
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
<tr v-for="(item, index) in tempList" :key="index"> <tr v-for="(item, index) in tempList" :key="index">
<td> <td>
<span class="circle" v-if="item.ExamineStatus==0||item.ExamineStatus==-1"></span> <span class="circle" v-if="(item.ExamineStatus==0||item.ExamineStatus==-1)&&(item.ZongExamineStatus==0||item.ZongExamineStatus==-1)"></span>
<span class="circle green" v-else-if="item.Status==0"></span> <span class="circle green" v-else-if="item.Status==0"></span>
<span class="circle red" v-else-if="item.Status==1||item.Status==2"></span> <span class="circle red" v-else-if="item.Status==1||item.Status==2"></span>
<span class="circle black" v-else-if="item.Status==3"></span> <span class="circle black" v-else-if="item.Status==3"></span>
...@@ -134,6 +135,14 @@ ...@@ -134,6 +135,14 @@
<td>{{item.BeginTime}}</td> <td>{{item.BeginTime}}</td>
<td>{{item.EndTime}}</td> <td>{{item.EndTime}}</td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td>
<span v-if="item.ZongExamineStatus==0" style="color:grey">审批中</span>
<span
v-else-if="item.ZongExamineStatus==1"
style="color:green;text-decoration: underline;"
>已通过</span>
<span v-else style="color:red;text-decoration: underline;">已驳回</span>
</td>
<td> <td>
<span v-if="item.ExamineStatus==0" style="color:grey">审批中</span> <span v-if="item.ExamineStatus==0" style="color:grey">审批中</span>
<span <span
...@@ -166,7 +175,7 @@ ...@@ -166,7 +175,7 @@
effect="dark" effect="dark"
content="编辑" content="编辑"
placement="top-start" placement="top-start"
v-if="item.ExamineStatus==0 || item.ExamineStatus==-1" v-if="(item.ExamineStatus==0 || item.ExamineStatus==-1) && (item.ZongExamineStatus==0 || item.ZongExamineStatus==-1)"
> >
<el-button <el-button
@click.stop="EditMsg(item)" @click.stop="EditMsg(item)"
...@@ -181,7 +190,7 @@ ...@@ -181,7 +190,7 @@
effect="dark" effect="dark"
content="删除" content="删除"
placement="top-start" placement="top-start"
v-if="item.ExamineStatus==0 || item.ExamineStatus==-1" v-if="item.ExamineStatus==0 && item.ZongExamineStatus==0"
> >
<el-button <el-button
style="padding:4px" style="padding:4px"
...@@ -210,7 +219,7 @@ ...@@ -210,7 +219,7 @@
effect="dark" effect="dark"
content="更新进度" content="更新进度"
placement="top-start" placement="top-start"
v-if="item.ExamineStatus==1 && (item.Status==1 || item.Status==0)" v-if="(item.ExamineStatus==1 ||item.ZongExamineStatus==1) && (item.Status==1 || item.Status==0)"
> >
<el-button <el-button
style="padding:4px" style="padding:4px"
......
src/components/work/workDetails.vue
View file @ 31ac4f86
...@@ -28,6 +28,71 @@ ...@@ -28,6 +28,71 @@
</fieldset> </fieldset>
<fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;"> <fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;">
<legend style="padding:0 10px; font-size:14px;">计划操作记录</legend> <legend style="padding:0 10px; font-size:14px;">计划操作记录</legend>
<div v-if="d.w.ZongExamineStatus!=0">
<el-card
class="work-content"
:class="{'blue':d.w.ZongExamineStatus==1,'red':d.w.ZongExamineStatus==-1}"
>
<el-row :gutter="10">
<el-col :span="22">
<h4>总经理审核{{d.w.ZongExamineStatus==-1?'驳回':'通过'}}</h4>
<p>徐总 提交于 {{d.w.ZongExamineDate}}</p>
<div class="cont">{{d.w.ZongExamineRemark}}</div>
</el-col>
<el-col :span="2">
<el-button
type="success"
v-if="!showZui3 && userInfo.EmployeeId==1"
@click="showZui3=true"
>追加信息</el-button>
<br/><br/>
<el-button
type="warning"
v-if="canCancel3 && userInfo.EmployeeId==1"
@click="cancelExamine(3)"
>取消审核</el-button>
</el-col>
</el-row>
<div v-if="d.w.ZongExamineRemarkExpand && d.w.ZongExamineRemarkExpand.length>0">
<div
v-for="(item, index) in d.w.ZongExamineRemarkExpand"
:key="index"
style="margin-top:10px;border-top:1px dotted #Fefefe;padding-top:10px;"
>
<el-row :gutter="12">
<el-col :span="24">
<el-tag type="success" style="margin-right:12px">追加信息</el-tag>
{{item.u}} 提交于 {{item.d}}
</el-col>
</el-row>
<el-row :gutter="12" style="margin-top:12px;">
<el-col :span="24">
<div class="cont">{{item.c}}</div>
</el-col>
</el-row>
</div>
</div>
<div
v-if="showZui3"
style="margin-top:10px;border-top:1px dotted #Fefefe;padding-top:10px;"
>
<div style="margin:10px 0;font-size:18px;">追加信息</div>
<div style="margin-bottom:10px">
<el-input
type="textarea"
:rows="2"
style="width:100%;color:#000 !important;"
placeholder="请输入追加内容信息"
v-model="examineRemarkExpand"
></el-input>
</div>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="setRemark(2)">确认提交</button>
<button class="normalBtn" @click="showZui3=false">取消</button>
</div>
</div>
</el-card>
</div>
<div v-if="d.w.ExamineStatus!=0"> <div v-if="d.w.ExamineStatus!=0">
<el-card <el-card
class="work-content" class="work-content"
...@@ -189,10 +254,10 @@ ...@@ -189,10 +254,10 @@
</div> </div>
</fieldset> </fieldset>
<fieldset <fieldset
v-if="isEaxmine && d.w && (d.w.ExamineStatus==0 || (d.w.Status>=2 && d.w.FinishExamineStatus==0))" v-if="isEaxmine && d.w && (((d.w.ExamineStatus==0 || (d.w.Status>=2 && d.w.FinishExamineStatus==0)) && userInfo.EmployeeId!=1) || (d.w.ZongExamineStatus==0 && userInfo.EmployeeId==1))"
style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:20px;" style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:20px;"
> >
<legend style="padding:0 10px; font-size:14px;">审批</legend> <legend style="padding:0 10px; font-size:14px;">{{userInfo.EmployeeId==1?"总经理":""}}审批</legend>
<div style="margin-bottom:10px"> <div style="margin-bottom:10px">
<el-radio v-model="radio" label="1">通过</el-radio> <el-radio v-model="radio" label="1">通过</el-radio>
<el-radio v-model="radio" label="-1">驳回</el-radio> <el-radio v-model="radio" label="-1">驳回</el-radio>
...@@ -301,6 +366,7 @@ export default { ...@@ -301,6 +366,7 @@ export default {
images: [], images: [],
showZui1: false, showZui1: false,
showZui2: false, showZui2: false,
showZui3: false,
examineRemarkExpand: "", examineRemarkExpand: "",
userInfo: {}, userInfo: {},
canCancel1:false, canCancel1:false,
...@@ -367,21 +433,22 @@ export default { ...@@ -367,21 +433,22 @@ export default {
if (this.d.w.ExamineStatus!=0) { if (this.d.w.ExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ExamineDate.replace(/-/g, "/")) let dateBegin = new Date(this.d.w.ExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime(); let dateDiff = dateEnd.getTime() - dateBegin.getTime();
if(dateDiff/1000/600>5){ if(dateDiff/1000/60<5){
this.canCancel1=true; this.canCancel1=true;
} }
} }
if (this.d.w.FinishExamineStatus!=0) { if (this.d.w.FinishExamineStatus!=0) {
let dateBegin = new Date(this.d.w.FinishExamineDate.replace(/-/g, "/")) let dateBegin = new Date(this.d.w.FinishExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime(); let dateDiff = dateEnd.getTime() - dateBegin.getTime();
if(dateDiff/1000/600<5){ if(dateDiff/1000/60<5){
this.canCancel2=true; this.canCancel2=true;
} }
} }
if (this.d.w.ZongExamineStatus!=0) { if (this.d.w.ZongExamineStatus!=0) {
let dateBegin = new Date(this.d.w.ZongExamineDate.replace(/-/g, "/")) let dateBegin = new Date(this.d.w.ZongExamineDate.replace(/-/g, "/"))
let dateDiff = dateEnd.getTime() - dateBegin.getTime(); let dateDiff = dateEnd.getTime() - dateBegin.getTime();
if(dateDiff/1000/600<5){ console.log(dateDiff)
if(dateDiff/1000/60<5){
this.canCancel3=true; this.canCancel3=true;
} }
} }
...@@ -434,6 +501,8 @@ export default { ...@@ -434,6 +501,8 @@ export default {
this.$message.error("请填写审批意见"); this.$message.error("请填写审批意见");
return; return;
} }
// console.log(this.radio);
// return;
this.apipost( this.apipost(
"user_post_SetWorkExamine", "user_post_SetWorkExamine",
{ {
...@@ -505,6 +574,7 @@ export default { ...@@ -505,6 +574,7 @@ export default {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.showZui1=false; this.showZui1=false;
this.showZui2=false; this.showZui2=false;
this.showZui3=false;
this.examineRemarkExpand=''; this.examineRemarkExpand='';
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -607,8 +677,12 @@ export default { ...@@ -607,8 +677,12 @@ export default {
color: #fff; color: #fff;
background: #f56c6c; background: #f56c6c;
} }
.work-content.blue{
background: #409eff;
}
.work-content.red *, .work-content.red *,
.work-content.green * { .work-content.green *,
.work-content.blue * {
color: #fff !important; color: #fff !important;
} }
.work-content * { .work-content * {
......
src/components/work/workManager.vue
View file @ 31ac4f86
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
<th>开始时间</th> <th>开始时间</th>
<th>截止时间</th> <th>截止时间</th>
<th>创建时间</th> <th>创建时间</th>
<th>总经理审批</th>
<th>立项审批信息</th> <th>立项审批信息</th>
<th>当前进度</th> <th>当前进度</th>
<th>完成审批信息</th> <th>完成审批信息</th>
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
</tr> </tr>
<tr v-for="(item, index) in DataList" :key="index"> <tr v-for="(item, index) in DataList" :key="index">
<td> <td>
<span class="circle" v-if="item.ExamineStatus==0||item.ExamineStatus==-1"></span> <span class="circle" v-if="(item.ExamineStatus==0||item.ExamineStatus==-1)&&(item.ZongExamineStatus==0||item.ZongExamineStatus==-1)"></span>
<span class="circle green" v-else-if="item.Status==0"></span> <span class="circle green" v-else-if="item.Status==0"></span>
<span class="circle red" v-else-if="item.Status==1||item.Status==2"></span> <span class="circle red" v-else-if="item.Status==1||item.Status==2"></span>
<span class="circle black" v-else-if="item.Status==3"></span> <span class="circle black" v-else-if="item.Status==3"></span>
...@@ -148,6 +149,14 @@ ...@@ -148,6 +149,14 @@
<td>{{item.BeginTime}}</td> <td>{{item.BeginTime}}</td>
<td>{{item.EndTime}}</td> <td>{{item.EndTime}}</td>
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td>
<span v-if="item.ZongExamineStatus==0" style="color:grey">审批中</span>
<span
v-else-if="item.ZongExamineStatus==1"
style="color:green;text-decoration: underline;"
>已通过</span>
<span v-else style="color:red;text-decoration: underline;">已驳回</span>
</td>
<td> <td>
<span v-if="item.ExamineStatus==0" style="color:grey">审批中</span> <span v-if="item.ExamineStatus==0" style="color:grey">审批中</span>
<span <span
...@@ -189,7 +198,22 @@ ...@@ -189,7 +198,22 @@
effect="dark" effect="dark"
content="审核" content="审核"
placement="top-start" placement="top-start"
v-if="item.ExamineStatus==0 || ((item.Status==2 || item.Status==3) && item.FinishExamineStatus==0)" v-if="userInfo.EmployeeId!=1 && (item.ExamineStatus==0 || ((item.Status==2 || item.Status==3) && item.FinishExamineStatus==0))"
>
<el-button
style="padding:4px"
type="primary"
icon="el-icon-check"
@click.stop="query2(item.Id)"
circle
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="总经理审核"
placement="top-start"
v-if="userInfo.EmployeeId==1 && item.ZongExamineStatus==0"
> >
<el-button <el-button
style="padding:4px" style="padding:4px"
......
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