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

src/components/ConstructionDetails/index.vue

@@ -693,9 +693,11 @@ export default {
     open(dicts, type = null,currentStatus = null,kind = null,title= null,zEngineeringNodeBo) {
       console.log(zEngineeringNodeBo)
       let data = {enginSort:zEngineeringNodeBo.enginType}
-      // if (this.node !== ''){
-      // }
-      // 腐蚀等级
+
+      data.enginNode = zEngineeringNodeBo.enginClassification
+      getEnginMaterialQualityList(data).then(res => {
+        this.materialQualityList = res.data
+      })
       data.enginStep = dicts[0].value;
       console.log(this.activeNames)
       if(this.node == '阀管'){

src/components/EnginNodeInfo/index.vue

@@ -197,18 +197,25 @@
           </el-form-item>
         </el-col>
         <!-- end -->
-        <el-col :span="7" v-if="materialComponList.includes('number')">
-<!--          <el-form-item-->
-<!--            :prop="'zEngineeringMaterialBo.' + index + '.number'"-->
-<!--            label-width="50px"-->
-<!--            label="米数"-->
-<!--          >-->
-<!--            &lt;!&ndash;                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"&ndash;&gt;-->
-<!--            <div class="block" style="display: inline-block; margin-right: 20px;">-->
-<!--              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>-->
+        <el-col :span="7" v-if="materialComponList.includes('number')" v-show="!materialComponList.includes('selfClosingValveType')">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.number'"
+            label-width="50px"
+            label="米数"
+          >
+            <!--                  :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%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>
+
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7" v-if="materialComponList.includes('selfClosingValveType')">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.number'"
+            label-width="50px"
+          ><div class="block" style="display: inline-block; margin-right: 20px;"></div></el-form-item>
 
-<!--            </div>-->
-<!--          </el-form-item>-->
         </el-col>
 
         <el-col :span="7" v-if="materialComponList.includes('specificConstruction')">

src/views/zdsz/house/index.vue

@@ -134,7 +134,7 @@
       <el-table-column label="户主姓名" align="center" prop="houseUserName" show-overflow-tooltip/>
       <el-table-column label="身份证" align="center" prop="idCard" show-overflow-tooltip/>
       <el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip/>
-      <el-table-column label="现主人电话" align="center" prop="newPhone" show-overflow-tooltip/>
+      <el-table-column label="现住人电话" align="center" prop="newPhone" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -242,7 +242,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="15">
-          <el-form-item label="现主人电话" prop="newPhone">
+          <el-form-item label="现住人电话" prop="newPhone">
             <el-table :data="newPhone" style="width: 100%">
               <el-table-column
               type="index"
@@ -278,7 +278,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog  >
-    <el-dialog title="新增现主人电话" :visible.sync="openPhone" width="30%" append-to-body>
+    <el-dialog title="新增现住人电话" :visible.sync="openPhone" width="30%" append-to-body>
       <el-input v-model="newphone">
         <template slot="prepend">手机号:</template>
       </el-input>