|
@@ -51,23 +51,26 @@
|
|
>存草稿</el-button
|
|
>存草稿</el-button
|
|
>
|
|
>
|
|
<!--不走审批流-->
|
|
<!--不走审批流-->
|
|
- <template v-if="!isApprove">
|
|
|
|
|
|
+ <template v-if="!isApprove||!hasApproveFlow">
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
type="primary"
|
|
type="primary"
|
|
size="medium"
|
|
size="medium"
|
|
|
|
+ :disabled="checkLoading"
|
|
@click.native="clickreportadd('dsfb')"
|
|
@click.native="clickreportadd('dsfb')"
|
|
>定时发布</el-button
|
|
>定时发布</el-button
|
|
>
|
|
>
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
type="primary"
|
|
type="primary"
|
|
size="medium"
|
|
size="medium"
|
|
|
|
+ :disabled="checkLoading"
|
|
@click.native="clickreportadd('fb')"
|
|
@click.native="clickreportadd('fb')"
|
|
:loading="isPublishloading"
|
|
:loading="isPublishloading"
|
|
>发布</el-button
|
|
>发布</el-button
|
|
>
|
|
>
|
|
</template>
|
|
</template>
|
|
- <template v-if="isApprove">
|
|
|
|
|
|
+ <template v-if="isApprove&&hasApproveFlow">
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
<el-button v-permission="permissionBtn.reportManageBtn.reportManage_publish"
|
|
|
|
+ :disabled="checkLoading"
|
|
type="primary" size="medium" @click="clickreportadd('submit')">提交</el-button>
|
|
type="primary" size="medium" @click="clickreportadd('submit')">提交</el-button>
|
|
</template>
|
|
</template>
|
|
</div>
|
|
</div>
|
|
@@ -509,6 +512,10 @@ export default {
|
|
frequency: res.Data.Frequency,
|
|
frequency: res.Data.Frequency,
|
|
content: res.Data.Content,
|
|
content: res.Data.Content,
|
|
};
|
|
};
|
|
|
|
+ let classify = this.aeForm.classifynameArr.map(i=>{
|
|
|
|
+ return JSON.parse(i).v||0
|
|
|
|
+ })
|
|
|
|
+ this.checkClassifyNameArr(1,classify)
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -520,6 +527,12 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
userclassidreportdetail() {
|
|
userclassidreportdetail() {
|
|
|
|
+ //检查classifynameArr是否有审批流
|
|
|
|
+ let classify = this.aeForm.classifynameArr.map(i=>{
|
|
|
|
+ return JSON.parse(i).v||0
|
|
|
|
+ })
|
|
|
|
+ this.checkClassifyNameArr(1,classify)
|
|
|
|
+
|
|
if (this.aeForm.add_type == 1) {
|
|
if (this.aeForm.add_type == 1) {
|
|
if (this.aeForm.classifynameArr.length == 2) {
|
|
if (this.aeForm.classifynameArr.length == 2) {
|
|
this.aeForm.title = JSON.parse(this.aeForm.classifynameArr[1]).l;
|
|
this.aeForm.title = JSON.parse(this.aeForm.classifynameArr[1]).l;
|