工程材质加工程步骤选项、小区导入模版增加户主信息、小区与房间手动修改增加操作

src/views/zdsz/area/index.vue

@@ -39,6 +39,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="管理所" prop="administrative">
+          <el-input
+            v-model="queryParams.administrative"
+            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>
@@ -153,6 +161,7 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.renovationColumn"/>
         </template>
       </el-table-column>
+      <el-table-column label="管理所" align="center" prop="administrative" show-overflow-tooltip/>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -243,7 +252,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属包" prop="belongingPack" >
-              <el-select v-model="form.belongingPack" placeholder="请选择所属包" style="width: 270px;">
+              <el-select v-model="form.belongingPack" placeholder="请选择所属包">
                 <el-option
                   v-for="dict in dict.type.belonging_pack"
                   :key="dict.value"
@@ -257,7 +266,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="是否改造列" prop="renovationColumn">
-              <el-select v-model="form.renovationColumn" placeholder="请选择是否改造列" style="width: 270px;">
+              <el-select v-model="form.renovationColumn" placeholder="请选择是否改造列">
                 <el-option
                   v-for="dict in dict.type.sys_yes_no"
                   :key="dict.value"
@@ -280,6 +289,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
+            <el-form-item label="来源" prop="source">
+              <el-select v-model="form.source" placeholder="请选择来源">
+                <el-option
+                  v-for="dict in dict.type.community_source"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="管理所" prop="administrative">
+                <el-input v-model="form.administrative" placeholder="请输入小区名称" style="width: 80%;" maxlength="50"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="100"/>
             </el-form-item>
@@ -408,6 +432,7 @@ export default {
         district: undefined,
         calculateDistrict: undefined,
         belongingPack: undefined,
+        administrative: undefined,
       },
       forms: {
         calculateDistrict: '',
@@ -498,12 +523,14 @@ export default {
         district: undefined,
         calculateDistrict: undefined,
         belongingPack: undefined,
+        source: undefined,
         remark: undefined,
         delFlag: 0,
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-        updateTime: undefined
+        updateTime: undefined,
+        administrative: undefined
       };
       this.resetForm("form");
     },

src/views/zdsz/enginMaterialQuality/index.vue

@@ -41,6 +41,17 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="工程步骤" prop="enginType" v-if="queryParams.enginType === '民用工程'">
+        <el-select v-model="queryParams.enginStep" placeholder="请选择工程环节" filterable clearable
+                   style="width: 100%" @change="$forceUpdate()">
+          <el-option
+            v-for="dict in dict.type[queryParams.enginSort+'_'+queryParams.enginNode]"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </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>
@@ -116,6 +127,11 @@
           <dict-tag :options="dict.type[scope.row.enginSort]" :value="scope.row.enginNode"/>
         </template>
       </el-table-column>
+      <el-table-column label="工程步骤" align="center" prop="enginStep" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type[scope.row.enginSort+'_'+scope.row.enginNode]" :value="scope.row.enginStep"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -182,6 +198,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="工程步骤" prop="enginStep" v-if="form.enginType === '民用工程'">
+          <el-select v-model="form.enginStep" placeholder="请选择工程步骤" filterable clearable
+                     style="width: 100%">
+            <el-option
+              v-for="dict in dict.type[form.enginSort+'_'+form.enginNode]"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="材质名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入材质名称" maxlength="50"/>
         </el-form-item>
@@ -205,7 +232,7 @@ import {
 
 export default {
   name: "EnginMaterialQuality",
-  dicts: ['engin_type','old_renovation','new_built'],
+  dicts: ['engin_type','old_renovation','new_built','old_renovation_indoor_engin','old_renovation_courtyard','old_renovation_overhead','new_built_indoor_engin','new_built_courtyard','new_built_overhead'],
   data() {
     return {
       // 按钮loading
@@ -281,6 +308,7 @@ export default {
         createTime: undefined,
         enginSort: undefined,
         enginNode: undefined,
+        enginStep: undefined,
         updateBy: undefined,
         updateTime: undefined
       };

src/views/zdsz/house/index.vue

@@ -39,6 +39,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="户主姓名" prop="houseUserName">
+        <el-input
+          v-model="queryParams.houseUserName"
+          placeholder="请输入户主姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="photo">
+        <el-input
+          v-model="queryParams.photo"
+          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>
@@ -107,6 +131,10 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+      <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="photo" show-overflow-tooltip/>
+      <el-table-column label="现主人电话" align="center" prop="newPhoto" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -186,7 +214,31 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="户主姓名" prop="houseUserName">
+              <el-input v-model="form.houseUserName" placeholder="请输入" maxlength="10"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入" maxlength="20"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="户主手机号" prop="photo">
+              <el-input v-model="form.photo" placeholder="请输入" maxlength="11"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="现主人电话" prop="newPhoto">
+              <el-input v-model="form.newPhoto" placeholder="请输入" maxlength="11"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="100"/>
             </el-form-item>
@@ -240,6 +292,9 @@ export default {
         buildingId: undefined,
         unitId: undefined,
         name: undefined,
+        houseUserName: undefined,
+        idCard: undefined,
+        photo: undefined,
       },
       // 表单参数
       form: {},
@@ -345,7 +400,11 @@ export default {
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-        updateTime: undefined
+        updateTime: undefined,
+        houseUserName: undefined,
+        idCard: undefined,
+        photo: undefined,
+        newPhoto: undefined
       };
       this.resetForm("form");
     },