diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 275984ed2..e6ef68362 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1509,19 +1509,19 @@ export default { if (res.data) { this.batchDeleteItem() } else if(this.selectedList === null){ - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') } else { this.deleteItemsModal = true } }, e => { }) } else { - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') } }, batchDeleteItem () { if (this.selectedList != null && this.selectedList.length > 0) { - this.$confirm('确认删除选择数据?', '提示', { + this.$confirm('请确认选择条款是否有子节点,若有,则此次删除将全部删除。', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -1556,7 +1556,7 @@ export default { }) }).catch(() => {}) } else { - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点,若有,则此次删除将全部删除。') } }, // 批量复制 事件 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index d32931ae4..475ccd070 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -277,14 +277,12 @@ { let data = JSON.parse(res.mesg) this.form.endTime = data.endTime || data.form.endTime - let commitStatus = res.commitStatus - if(commitStatus && commitStatus > 0){ - this.acceptShow = true - this.submitShow = false - }else { - this.acceptShow = false - this.submitShow = true - } + // let commitStatus = res.commitStatus + // if(commitStatus && commitStatus > 0){ + // this.acceptShow = true + // this.submitShow = false + // }else { + // this.acceptShow = false + // this.submitShow = true + // } + this.submitShow = true this.AOLIGEI = data.AOLIGEI this.commentText3 = data.commentText3 || '' this.todoId = res.id diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 122404ca2..ff937e6b9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4009,7 +4009,7 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort+" "+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort+""+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit'