所有删除项不提示ID提示名称

表格统计项不加边框与鼠标放入样式
审核过后保留节点弹窗
批量审核增加必填校验

src/views/zdsz/enginee/material/material_statistics/index.vue

@@ -88,8 +88,6 @@
                 class="materialStatisticsTable"
                 :data="tableData"
 
-                border
-
                 style="width: 100%">
               <el-table-column
                 prop="areaName"
@@ -350,7 +348,7 @@ export default {
             }, `用料统计${new Date().getTime()}.xlsx`)
         },
         tableRowClassName(){
-            return "background:#199ED8;border: 2px solid #000066"
+            // return "background:#199ED8;border: 2px solid #000066"
         },
       toModule(){
         console.log(this.$router)
@@ -429,7 +427,7 @@ export default {
     }
     .materialStatisticsTable{
         margin-top: 1%;
-        border: 2px solid #000066 !important;
+        // border: 2px solid #000066 !important;
 
     }
     .materialStatisticsTable::before{
@@ -447,7 +445,7 @@ export default {
     background-color: #199ED8;
 }
 .el-table--border th.el-table__cell{
-    border: 2px solid #000066 !important;
+    // border: 2px solid #000066 !important;
 }
 .el-table__empty-block{
     background-color: #199ED8;
@@ -457,7 +455,7 @@ export default {
 }
 .el-table__cell{
     background-color: #199ED8 ;
-    border: 2px solid #000066 !important;
+    // border: 2px solid #000066 !important;
 }
 .el-table__cell >div{
     text-align: center;

src/views/zdsz/enginee/material/progres_statistics/progres_statistics.vue

@@ -68,7 +68,6 @@
         <el-table
             class="materialStatisticsTable"
             :data="tableData"
-            header-cell-style="background-color:#FFFFFF;border: 1px solid #000066"
             border
             :cell-style="tableRowClassName"
             style="width: 100%">
@@ -186,7 +185,7 @@ export default {
           })
       },
         tableRowClassName(){
-            return "background:#FFFFFF;border: 1px solid #000066"
+            // return "background:#FFFFFF;border: 1px solid #000066"
         },
     toModule(){
       console.log(this.$router)
@@ -234,19 +233,19 @@ export default {
     }
     .materialStatisticsTable{
         margin-top: 1%;
-        border: 2px solid #000066 !important;
+        // border: 2px solid #000066 !important;
         cursor: pointer;
         ::v-deep .el-table__row{
-            background-color: #2F4280;
-        }
-        ::v-deep tbody tr:hover>td {
-            transform: translateX(3px) translateY(-3px);
-            z-index: 100;
-            box-shadow: 3px 3px 3px 3px rgba(82, 82, 82, 0.5);
-            background-color: rgba(98, 98, 98, 0.52);
-          font-size: 15px;
-            color: #ea0404;
+            // background-color: #2F4280;
         }
+        // ::v-deep tbody tr:hover>td {
+        //     transform: translateX(3px) translateY(-3px);
+        //     z-index: 100;
+        //     box-shadow: 3px 3px 3px 3px rgba(82, 82, 82, 0.5);
+        //     background-color: rgba(98, 98, 98, 0.52);
+        //   font-size: 15px;
+        //     color: #ea0404;
+        // }
     }
     .materialStatisticsTable::before{
         background-color:#000066 ;

src/views/zdsz/engineeringCivil/index.vue

@@ -452,7 +452,7 @@
       :visible.sync="checkingsVisible"
       class="checkingAll"
     >
-      <el-form :model="checkingForm">
+      <el-form :model="checkingForm" :rules="checkingFormRules" ref="checkingFormAll">
         <el-form-item label="工程类型" prop="enginType">
           <el-select
             v-model="checkingForm.enginType"
@@ -481,7 +481,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="环节" label-width="68px">
+        <el-form-item label="环节" label-width="78px" prop="type">
           <el-select
             v-model="checkingForm.type"
             placeholder="请选择工程分类"
@@ -494,7 +494,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="" label="工程创建时间" style="margin-left: -5%;">
+        <el-form-item prop="reviewTime" label="工程创建时间" style="margin-left: -5%;">
           <el-date-picker
             v-model="checkingForm.reviewTime"
             type="month"
@@ -503,8 +503,9 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item
-          label-width="70px"
+          label-width="78px"
           label="审核状态"
+          prop="reviewStatus"
         >
           <el-select v-model="checkingForm.reviewStatus" placeholder="请选择审核状态" label="审核状态">
             <el-option
@@ -517,8 +518,9 @@
         </el-form-item>
 
         <el-form-item
-          label-width="70px"
+          label-width="78px"
           label="审核内容"
+          prop="reviewContent"
         >
           <div class="block" style="display: inline-block; margin-right: 20px;">
             <el-input
@@ -612,6 +614,26 @@ export default {
       enginId: undefined,
       checkingsVisible: false,
       updateOption: [],
+      checkingFormRules:{
+        enginType: [
+            {required: true, message: "工程类型不能为空", trigger: ['change']}
+        ],
+        enginClassification: [
+            {required: true, message: "工程分类不能为空", trigger: ['change']}
+        ],
+        type: [
+            {required: true, message: "环节不能为空", trigger: ['change']}
+        ],
+        reviewTime: [
+            {required: true, message: "工程创建时间不能为空", trigger: ['change']}
+        ],
+        reviewStatus: [
+            {required: true, message: "审核状态不能为空", trigger: ['change']}
+        ],
+        reviewContent: [
+            {required: true, message: "审核内容不能为空", trigger: ['change']}
+        ],
+      },
       listContain: [
         {
           name: '拆旧管',
@@ -992,6 +1014,7 @@ export default {
       zEngineeringNodeBo:{
 
       },
+      currentEnginName: null,
     };
   },
   created() {
@@ -1006,22 +1029,29 @@ export default {
   },
   methods: {
     checkingAllSubmit() {
-      // this.checkingForm.createTime = formatDate(this.checkingForm.createTime)
-      engineeringCivilAllReview(this.checkingForm).then(res => {
-        if (res.code == 200) {
-          this.$message({
-            message: '批量审核请求以提交后台，5-10分钟后均可成功。',
-            type: 'success'
-          });
-          this.checkingsVisible = false
-          this.checkingForm = {
-            reviewStatus: '',               // 审核状态
-            reviewContent: '',              // 审核内容
-            enginType: null,
-            enginClassification: null,
-            reviewTime: '',
-            type: '',
-          }
+      this.$refs.checkingFormAll.validate(valid => {
+        if(valid){
+          // this.checkingForm.createTime = formatDate(this.checkingForm.createTime)
+          engineeringCivilAllReview(this.checkingForm).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                message: '批量审核请求以提交后台，5-10分钟后均可成功。',
+                type: 'success'
+              });
+              this.checkingsVisible = false
+              this.checkingForm = {
+                reviewStatus: '',               // 审核状态
+                reviewContent: '',              // 审核内容
+                enginType: null,
+                enginClassification: null,
+                reviewTime: '',
+                type: '',
+              }
+              this.$refs.checkingFormAll.resetFields()
+            }
+          })
+        } else {
+          this.$message.error('请填写必填项!')
         }
       })
     },
@@ -1039,6 +1069,7 @@ export default {
             message: '审核成功',
             type: 'success'
           });
+          this.viewNodeSource()
         }
       })
     },
@@ -1075,12 +1106,13 @@ export default {
         this.$refs.ConstructionDetails.open(dict)
       })
     },
-    viewNodeSource(e) {
+    viewNodeSource(e = null) {
       viewEngineeringCivilSource({
         id: this.enginId,
-        type: e
+        type: e || this.currentEnginName
       }).then(res => {
         console.log('______', res)
+        this.currentEnginName = e
         this.createTime = res.data.createTime
         try {
           this.updateParams = res.data
@@ -1486,8 +1518,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(row)
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除民用工程编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除所选数据项？').then(() => {
         this.loading = true;
         return delEngineeringCivil(ids);
       }).then(() => {