FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
宋伟佳
2022-03-29 17:08:47 +08:00
parent 3e3eda649e 45b0eb1d0b
commit 8696d083bf
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+1 -2
View File
@@ -1865,7 +1865,7 @@
getTaskId (mesg) { getTaskId (mesg) {
this.form = mesg.form this.form = mesg.form
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) 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['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
@@ -2711,7 +2711,6 @@
this.summary=this.summaryList.map(item => item.id).join(",") this.summary=this.summaryList.map(item => item.id).join(",")
this.summaryName=this.summaryList.map(item => item.name).join(",") this.summaryName=this.summaryList.map(item => item.name).join(",")
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+1 -1
View File
@@ -1833,7 +1833,7 @@
getTaskId (mesg) { getTaskId (mesg) {
this.form = mesg.form this.form = mesg.form
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) 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['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
-2
View File
@@ -1508,8 +1508,6 @@
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
if(this.form.fsRejectStatus === 1){ if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne() this.evaluationHisListByOne()
}else {
this.getEvaluation()
} }
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
-2
View File
@@ -1533,8 +1533,6 @@
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
if(this.form.fsRejectStatus === 1){ if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne() this.evaluationHisListByOne()
}else {
this.getEvaluation()
} }
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])