Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/components/EnginNodeInfo/index.vue

@@ -119,7 +119,7 @@
           >
             <!--                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"-->
             <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input v-model="item.number" placeholder="请输入数量" style="width: 100%" type="number" maxlength="11" :disabled="status == 'read-only'"></el-input>
+              <el-input v-model="item.number" placeholder="请输入数量" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" :disabled="status == 'read-only'"></el-input>
             </div>
           </el-form-item>
         </el-col>

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

@@ -202,9 +202,11 @@ export default {
             currentBuilding:null,       // 当前楼宇
             currentUnit:null,// 当前单元
           queryParams:{
+            district:null,
             areaId:undefined,
             realityQuality:undefined,
-            realitySpecifications:undefined
+            realitySpecifications:undefined,
+            enginCycle:null
           },
           EnginMaterialQualityList:[],
           EnginSpecificationsList:[],
@@ -264,6 +266,13 @@ export default {
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.queryParams = {
+            district:null,
+            areaId:undefined,
+            realityQuality:undefined,
+            realitySpecifications:undefined,
+            enginCycle:null
+          },
         this.tableData=[]
         //this.handleQuery();
       },

src/views/zdsz/engineeringCivil/index.vue

@@ -451,6 +451,7 @@
       title="批量审核"
       :visible.sync="checkingsVisible"
       class="checkingAll"
+      @close="checkingAllFormClosed"
     >
       <el-form :model="checkingForm" :rules="checkingFormRules" ref="checkingFormAll">
         <el-form-item label="工程类型" prop="enginType">
@@ -1028,6 +1029,9 @@ export default {
     }
   },
   methods: {
+    checkingAllFormClosed(){
+      this.$refs.checkingFormAll.resetFields()
+    },
     validateCHanged(e){
       this.reviewStatusList[e].label == '通过' ? this.checkingFormRules.reviewContent[0].required = true : this.checkingFormRules.reviewContent[0].required = false
     },
@@ -1072,7 +1076,9 @@ export default {
             message: '审核成功',
             type: 'success'
           });
-          this.viewNodeSource()
+          setTimeout(() => {
+            this.viewNodeSource()
+          },1000)
         }
       })
     },
@@ -1110,12 +1116,15 @@ export default {
       })
     },
     viewNodeSource(e = null) {
+      if(e){
+        this.currentEnginName = e
+      }
+      console.log(this.currentEnginName )
       viewEngineeringCivilSource({
         id: this.enginId,
-        type: e || this.currentEnginName
+        type: e || this.currentEnginName 
       }).then(res => {
-        console.log('______', res)
-        this.currentEnginName = e
+        console.log('______', res) 
         this.createTime = res.data.createTime
         try {
           this.updateParams = res.data