diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 91b471bb3..ede994365 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -39,7 +39,6 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index f477a26c5..18460cb17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -38,9 +38,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index eb6f21c9e..84ca37fc6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -37,7 +37,6 @@ disabled v-model="form.endTime" type="date" - value-format="yyyy-MM-dd" placeholder="请选择结束日期"> diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 6e876e8b2..7289b73bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -35,7 +35,6 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 76c0f7e02..2ced168e3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -34,7 +34,6 @@ { if (valid) { this.isSubmit = true - var json = this.json + let json = this.json + json.info = this.data json.commentText = this.commentText41 json.bzfgId = this.form.bzfgId json.bzfgName = this.form.bzfgName diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index f305809b4..dfe399d15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -37,7 +37,6 @@ disabled v-model="form.endTime" type="date" - value-format="yyyy-MM-dd" placeholder="请选择结束日期"> @@ -397,7 +396,8 @@ }, handleSubmit() { this.isSubmit = true - var json = this.json + let json = this.json + json.info = this.data json.commentText = this.commentText42 json.bzFlag = '0' this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 12a5a2ebe..fe5399ae3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -35,7 +35,6 @@ @@ -645,10 +644,11 @@ export default { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true - var json = this.json + let json = this.json json.actionFlag = 0 json.commentText = this.commentText4 json.spId = this.form.spId + json.info = this.data json.spName = this.form.spName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 2caa67e8c..a9f199be1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -626,6 +626,16 @@ this.form.textType = data.form ? data.form.textType : data.textType this.form.cid = data.form ? data.form.cid : data.cid this.form.endTime = data.form ? data.form.endTime : data.endTime + this.$http.get('slrs/sar-public-idea-all/checkIsShow', { + endTime: this.form.endTime + }, {}, res => { + //返回0 流程未到截止日期 不能进行操作 + if (res.message === '0') { + this.clickFlag = false + } else { + this.clickFlag = true + } + }) let newArr = data.info ? data.info : data.form.data newArr.forEach(item => { if (!item.source) { @@ -639,16 +649,6 @@ this.json = data; this.getItemList(data.standId,this.form.textValue) this.data = newArr - this.$http.get('slrs/sar-public-idea-all/checkIsShow', { - endTime: this.form.endTime - }, {}, res => { - //返回0 流程未到截止日期 不能进行操作 - if (res.message === '0') { - this.clickFlag = false - } else { - this.clickFlag = true - } - }) if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {