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

jero-web/src/common/lang/en-us.js

@@ -1261,4 +1261,5 @@ module.exports = {
   currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up',
   currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down',
   weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report',
+  thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1363,4 +1363,5 @@ module.exports = {
   currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移',
   currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移',
   weilaiRegulationMonthlyReport:'蔚来法规月报',
+  thereTitleWhichCannotBeDeleted:'该标题下存在新增内容,不能删除',
 }

jero-web/src/components/tableCollection/index.vue

@@ -455,6 +455,7 @@
                 console.log(res)
                 if (res.data.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
+                  // this.$refs['ruleFormOne'].resetFields()
                   _this.areaVisiblezr = false
                   this.getLoginUserType()
                 } else {
@@ -495,6 +496,7 @@
                 console.log(res)
                 if (res.data.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
+                  this.$refs['ruleForm'].resetFields()
                   _this.areaVisible = false
                   this.getLoginUserType()
                 } else {
@@ -518,23 +520,25 @@
       },
       // 点击工程接口人的详情人员 有权限
       areaOfResponsibility(record) {
-        this.areaVisible = true
+
         // this.$refs.ruleForm.clearValidate()
         this.$nextTick(() => {
           this.Dateline = { ...this.Dateline }
           this.getquerySdtList(record)
           this.$refs.ruleForm.clearValidate()
         })
+        this.areaVisible = true
       },
       // 点击责任领域的详情人员 有权限
       ondataValueTobe(record) {
-        this.areaVisiblezr = true
+
         // this.$refs.ruleForm.clearValidate()
         this.$nextTick(() => {
           this.Dateline = { ...this.Dateline }
           this.getquerySdtId = record.id
           this.$refs.ruleFormOne.clearValidate()
         })
+        this.areaVisiblezr = true
       },
       dataValueTobeinitiated() {
         this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -205,6 +205,15 @@
           this.$message.warning(this.$t('thereWhichCannotDeleted'))
           return
         }
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/verifyDelete', { ids: val.id }).then((res) => {
+          if (res.result == 'true') {
+            this.deleteBatch(val)
+          } else {
+            this.$message.warning(this.$t('thereTitleWhichCannotBeDeleted'))
+          }
+        })
+      },
+      deleteBatch(val) {
         let _this = this
         this.$confirm({
           content: _this.$t('ConfirmDelete'),