Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/ConstructionDetails/index.vue

@@ -37,9 +37,13 @@
             <!--  人员信息 -->
             <div class="personInfo">
               <span>负责人：{{ e.headName }} </span>
+              <span>负责人电话：{{
+                  e.headPhone === undefined || e.headPhone === null || e.headPhone === '' ? '无' : e.headPhone
+                }}</span>
               <span>施工人：{{ e.constructUser }}</span>
-              <span>负责人电话：{{ e.headPhone }}</span>
-              <span>施工人电话：{{ e.constructPhone }}</span>
+              <span>施工人电话：{{
+                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone
+                  }}</span>
             </div>
             <hr>
             <!--  用料明细 -->
@@ -538,7 +542,7 @@ export default {
   }
 
   ::v-deep .rmOldPie {
-    
+
     .el-collapse-item {
       border: none;
     }

src/views/zdsz/house/index.vue

@@ -31,6 +31,14 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="房间名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入房间名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>