Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -1865,7 +1865,7 @@
|
||||
getTaskId (mesg) {
|
||||
this.form = mesg.form
|
||||
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
|
||||
this.getEvaluation()
|
||||
// this.getEvaluation()
|
||||
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
|
||||
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
|
||||
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
|
||||
@@ -2711,7 +2711,6 @@
|
||||
|
||||
this.summary=this.summaryList.map(item => item.id).join(",")
|
||||
this.summaryName=this.summaryList.map(item => item.name).join(",")
|
||||
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('id', this.bpnId || '')
|
||||
|
||||
@@ -1833,7 +1833,7 @@
|
||||
getTaskId (mesg) {
|
||||
this.form = mesg.form
|
||||
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
|
||||
this.getEvaluation()
|
||||
// this.getEvaluation()
|
||||
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
|
||||
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
|
||||
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
|
||||
|
||||
@@ -1508,8 +1508,6 @@
|
||||
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
|
||||
if(this.form.fsRejectStatus === 1){
|
||||
this.evaluationHisListByOne()
|
||||
}else {
|
||||
this.getEvaluation()
|
||||
}
|
||||
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
|
||||
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
|
||||
|
||||
@@ -1533,8 +1533,6 @@
|
||||
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
|
||||
if(this.form.fsRejectStatus === 1){
|
||||
this.evaluationHisListByOne()
|
||||
}else {
|
||||
this.getEvaluation()
|
||||
}
|
||||
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
|
||||
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
|
||||
|
||||
Reference in New Issue
Block a user