|
|
@@ -43,7 +43,8 @@
|
|
|
<div class="danjuMsgSelect">
|
|
|
<span class="data_tit">申报月份:</span>
|
|
|
<span v-if="receiptMsg.stage !== '已驳回'">{{receiptMsg.month}}月</span>
|
|
|
- <el-date-picker v-else v-model="receiptMsg.month" @change="changeMonth" type="month" placeholder="选择月份" value-format="MM" />
|
|
|
+ <el-date-picker v-else v-model="receiptMsg.month" @change="changeMonth" type="month"
|
|
|
+ placeholder="选择月份" value-format="MM" />
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -145,7 +146,7 @@
|
|
|
</el-pagination>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="本月主要工作完成情况" name="second">
|
|
|
- <div class="detaTableBtns" v-if="tabName === 'first'">
|
|
|
+ <div class="detaTableBtns" v-if="tabName === 'first'">
|
|
|
<div class="tableBtn add" @click="addSecondWork">
|
|
|
<img :src="addIcon" alt="">
|
|
|
<span>新增</span>
|
|
|
@@ -404,7 +405,7 @@
|
|
|
let show = true
|
|
|
if (val.stage !== '已驳回') {
|
|
|
show = false
|
|
|
- } else if(this.ispersonDept !== 'true') {
|
|
|
+ } else if (this.ispersonDept !== 'true') {
|
|
|
show = false
|
|
|
}
|
|
|
return show
|
|
|
@@ -413,7 +414,7 @@
|
|
|
this.modeifyDetail('desLeave', val)
|
|
|
},
|
|
|
changeMonth(val) {
|
|
|
- let value = val*1
|
|
|
+ let value = val * 1
|
|
|
this.modeifyDetail('month', value)
|
|
|
},
|
|
|
changeratingGrade(val) {
|
|
|
@@ -430,7 +431,7 @@
|
|
|
}
|
|
|
if (type === 'level') {
|
|
|
params.ratingGrade = val
|
|
|
- } else if(type === 'des') {
|
|
|
+ } else if (type === 'des') {
|
|
|
params.declarationReason = val
|
|
|
} else if (type === 'desLeave') {
|
|
|
params.declarationLevel = val
|
|
|
@@ -482,7 +483,8 @@
|
|
|
type: row.checkCycle === 'YDKP' ? '月度考评' : row.checkCycle === 'JDKP' ? '季度考评' :
|
|
|
'年度考评',
|
|
|
year: row.annual,
|
|
|
- month: row.declarationMonth.length > 1 ? row.declarationMonth : '0'+row.declarationMonth,
|
|
|
+ month: row.declarationMonth.length > 1 ? row.declarationMonth : '0' + row
|
|
|
+ .declarationMonth,
|
|
|
recStage: '有效'
|
|
|
}
|
|
|
}
|
|
|
@@ -765,7 +767,7 @@
|
|
|
actionCS = 'reject'
|
|
|
}
|
|
|
this.submitIsdoAction(actionCS)
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
submitIsdoAction(taskType, nodeSc) {
|
|
|
@@ -799,24 +801,22 @@
|
|
|
message: datas.data.data,
|
|
|
type: 'success'
|
|
|
})
|
|
|
- if (taskType === 'reject') {
|
|
|
- let params = {
|
|
|
- id: that.instanceChild.bizKey,
|
|
|
- stage: '已驳回'
|
|
|
- }
|
|
|
- apideptAdState(params).then(values =>{
|
|
|
- if (values.success) {
|
|
|
- that.dialogVisible = false
|
|
|
- that.$emit('approveMsg', datas.data.isOk)
|
|
|
- } else {
|
|
|
- that.$message({
|
|
|
- message: values.message,
|
|
|
- type: 'error'
|
|
|
- });
|
|
|
- }
|
|
|
- })
|
|
|
+ let params = {
|
|
|
+ id: that.instanceChild.bizKey,
|
|
|
+ stage: taskType === 'reject' ? '已驳回' : ''
|
|
|
}
|
|
|
-
|
|
|
+ apideptAdState(params).then(values => {
|
|
|
+ if (values.success) {
|
|
|
+ that.dialogVisible = false
|
|
|
+ that.$emit('approveMsg', datas.data.isOk)
|
|
|
+ } else {
|
|
|
+ that.$message({
|
|
|
+ message: values.message,
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
} else {
|
|
|
that.$message({
|
|
|
message: datas.data.msg,
|
|
|
@@ -995,7 +995,7 @@
|
|
|
top: -4px;
|
|
|
}
|
|
|
|
|
|
- .el-date-editor--month{
|
|
|
+ .el-date-editor--month {
|
|
|
width: 50%;
|
|
|
}
|
|
|
}
|
