基础信息列表加来源统计、工程弹窗页面修改

src/components/ConstructionDetails/index.vue

@@ -59,8 +59,6 @@
                       v-show="i.materialQuality != null"
                       label-width="95px"
                       >
-                      <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
-                      <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
                       <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index,idx)" :disabled="status == 'read-only' ">
                           <el-option
                           v-for="e in (activeNames == '阀管' ?materialQualityList_zjg:materialQualityList)"
@@ -689,35 +687,39 @@ export default {
         this.loading = false;
       });
     },
-    // 查看历史
-    open(dicts, type = null,currentStatus = null,kind = null,title= null,enginClassification,enginType) {
-      if (kind=='民用'||kind=='基建')
-      {
-      this.enginType=enginType
-      this.enginClassification=enginClassification
-      let data = {enginSort:enginType}
-      data.enginNode = enginClassification
-      getEnginMaterialQualityList(data).then(res => {
-        this.materialQualityList = res.data
-      })
-      data.enginStep = dicts[0].value;
-      console.log(this.activeNames)
-      if(this.node == '阀管'){
-        data.nameType = "自闭阀厂家";
+    /**
+     * 查看历史
+     * @param dicts 节点集合
+     * @param type 字典type
+     * @param currentStatus 审核状态
+     * @param kind 工程类型（基建工程用）
+     * @param title 标题
+     * @param enginClassification 工程类型（民用工程用）
+     * @param enginSort 工程分类
+     * @param enginType 工程大类名称
+     */
+    open(dicts, type = null,currentStatus = null,kind = null,title= null,enginClassification,enginSort,enginType) {
+      // if (kind=='民用'||kind=='基建'){
+        this.enginType=enginType
+        this.enginClassification=enginClassification
+        let data = {enginType:enginType}
+        data.enginSort = enginSort
+        data.enginNode = enginClassification
+        data.enginStep = Array.isArray(dicts) ? dicts[0].value: null;
         getEnginMaterialQualityList(data).then(res => {
-          this.materialQualityList_zbf = res.data
-        })
-        data.nameType = "灶具管厂家";
-        getEnginMaterialQualityList(data).then(res => {
-          this.materialQualityList_zjg = res.data
+          this.materialQualityList = res.data
         })
-      }
-      //data.enginStep = this.node
-      // data.enginNode = enginClassification
-      // getEnginMaterialQualityList(data).then(res => {
-      //   this.materialQualityList = res.data
-      // })
-      }
+        if(this.node == '阀管'){
+          data.nameType = "自闭阀厂家";
+          getEnginMaterialQualityList(data).then(res => {
+            this.materialQualityList_zbf = res.data
+          })
+          data.nameType = "灶具管厂家";
+          getEnginMaterialQualityList(data).then(res => {
+            this.materialQualityList_zjg = res.data
+          })
+        }
+      // }
       this.currentStatus = currentStatus
       this.titleName = title
       this.checkingVisible = false

src/views/zdsz/area/index.vue

@@ -19,26 +19,26 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="核算行政区" prop="calculateDistrict">
-        <el-select v-model="queryParams.calculateDistrict" placeholder="请选择核算行政区" clearable>
-          <el-option
-            v-for="dict in dict.type.district"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属包" prop="belongingPack">
-        <el-select v-model="queryParams.belongingPack" placeholder="请选择所属包" clearable>
-          <el-option
-            v-for="dict in dict.type.belonging_pack"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="核算行政区" prop="calculateDistrict">-->
+<!--        <el-select v-model="queryParams.calculateDistrict" placeholder="请选择核算行政区" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.district"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="所属包" prop="belongingPack">-->
+<!--        <el-select v-model="queryParams.belongingPack" placeholder="请选择所属包" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.belonging_pack"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="管理所" prop="administrative">
           <el-input
             v-model="queryParams.administrative"
@@ -100,17 +100,17 @@
         >导出小区
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExports"
-        >所属包导出
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExports"-->
+<!--        >所属包导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -141,21 +141,17 @@
           <dict-tag :options="dict.type.district" :value="scope.row.district"/>
         </template>
       </el-table-column>
-      <el-table-column label="核算行政区" align="center" prop="calculateDistrict">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.district" :value="scope.row.calculateDistrict"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属包" align="center" prop="belongingPack">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.belonging_pack" :value="scope.row.belongingPack"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.community_source" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="核算行政区" align="center" prop="calculateDistrict">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.district" :value="scope.row.calculateDistrict"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="所属包" align="center" prop="belongingPack">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.belonging_pack" :value="scope.row.belongingPack"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="来源" align="center" prop="source"/>
       <el-table-column label="是否改造列" align="center" prop="renovationColumn">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.renovationColumn"/>
@@ -251,20 +247,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属包" prop="belongingPack" >
-              <el-select v-model="form.belongingPack" placeholder="请选择所属包">
-                <el-option
-                  v-for="dict in dict.type.belonging_pack"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
             <el-form-item label="是否改造列" prop="renovationColumn">
               <el-select v-model="form.renovationColumn" placeholder="请选择是否改造列">
                 <el-option
@@ -276,33 +258,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="核算行政区" prop="calculateDistrict">
-              <el-select v-model="form.calculateDistrict" placeholder="请选择核算行政区">
-                <el-option
-                  v-for="dict in dict.type.district"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </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-row>
+        <el-row :gutter="20">
+                <el-col :span="20">
+                  <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"/>
@@ -368,16 +330,16 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属包" prop="belongingPack">
-          <el-select v-model="forms.belongingPack" placeholder="请选择所属包" clearable style="width: 100%">
-            <el-option
-              v-for="dict in dict.type.belonging_pack"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="所属包" prop="belongingPack">-->
+<!--          <el-select v-model="forms.belongingPack" placeholder="请选择所属包" clearable style="width: 100%">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.belonging_pack"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -468,21 +430,21 @@ export default {
         scale: [
           {required: true, message: "小区规模不能为空", trigger: "blur"}
         ],
-        releaseIs: [
-          {required: false, message: "是否释放不能为空", trigger: "change"}
-        ],
-        releaseBy: [
-          {required: false, message: "释放人不能为空", trigger: "change"}
-        ],
+        // releaseIs: [
+        //   {required: false, message: "是否释放不能为空", trigger: "change"}
+        // ],
+        // releaseBy: [
+        //   {required: false, message: "释放人不能为空", trigger: "change"}
+        // ],
         district: [
           {required: true, message: "行政区不能为空", trigger: "change"}
         ],
-        calculateDistrict: [
-          {required: true, message: "核算行政区不能为空", trigger: "change"}
-        ],
-        belongingPack: [
-          {required: true, message: "所属包不能为空", trigger: "change"}
-        ],
+        // calculateDistrict: [
+        //   {required: false, message: "核算行政区不能为空", trigger: "change"}
+        // ],
+        // belongingPack: [
+        //   {required: false, message: "所属包不能为空", trigger: "change"}
+        // ],
         remark: [
           {required: false, message: "备注不能为空", trigger: "blur"}
         ],
@@ -522,7 +484,6 @@ export default {
         releaseBy: undefined,
         district: undefined,
         calculateDistrict: undefined,
-        belongingPack: undefined,
         source: undefined,
         remark: undefined,
         delFlag: 0,

src/views/zdsz/building/index.vue

@@ -69,11 +69,7 @@
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
       <el-table-column label="小区名称" align="center" prop="areaName"/>
       <el-table-column label="楼宇名称" align="center" prop="name"/>
-      <el-table-column label="来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.community_source" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="来源" align="center" prop="source"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

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

@@ -377,7 +377,7 @@ export default {
         }
         console.log(dict)
         setTimeout(() => {
-          this.$refs.ConstructionDetails.open(dict,null,null,'民用',this.currentEnginClassification,this.currentEnginType)
+          this.$refs.ConstructionDetails.open(dict,this.currentEnginType,null,'民用','施工记录',this.currentEnginClassification)
         })
       })
       this.status = 'read-only'
@@ -523,7 +523,7 @@ export default {
 
     .room {
       flex: 1;
-      width: 50px;
+      width: 60px;
       height: 25px;
       text-align: center;
       line-height: 25px;

src/views/zdsz/engineeringCivil/index.vue

@@ -1519,7 +1519,7 @@ export default {
           })
         }
         this.zEngineeringNodeBo=e
-        this.$refs.ConstructionDetails.open(dict, null, null, null, title,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
+        this.$refs.ConstructionDetails.open(dict, null, null, '民用', title,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
       })
     },
     viewNodeSource(e = null) {

src/views/zdsz/engineeringDangerous/index.vue

@@ -628,7 +628,7 @@ export default {
     //备用
     viewSource(e) {
       this.currentId = e.id
-      this.$refs.ConstructionDetails.open(_, "危险作业工程")
+      this.$refs.ConstructionDetails.open(_, "危险作业工程",null,null,null,null,null,"危险作业工程")
     },
     viewNodeSource(e) {
       // todo: 获取数据

src/views/zdsz/engineeringIndustry/index.vue

@@ -693,13 +693,13 @@ export default {
     viewSource(e) {
       console.log(e)
       this.currentId = e.id
-      this.$refs.ConstructionDetails.open(_, this.form.type)
+      this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
       this.status = 'read-only'
     },
     // 历史查询
     updateviewSource(e) {
       this.currentId = e.id
-      this.$refs.ConstructionDetails.open(_, this.form.type)
+      this.$refs.ConstructionDetails.open(_, this.form.type,null,null,null,null,null,this.form.type === '1' ? "工业工程" : "市政工程")
       this.status = 'put'
     },
     viewNodeSource(e) {

src/views/zdsz/house/index.vue

@@ -39,6 +39,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="queryParams.source" placeholder="请选择来源" filterable>
+          <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="houseUserName">
         <el-input
           v-model="queryParams.houseUserName"
@@ -215,17 +226,29 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
+            <el-form-item label="来源" prop="source">
+              <el-select v-model="form.source" placeholder="请选择来源" filterable>
+                <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-col>
+          <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-row>
+        <el-row :gutter="20">
           <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="phone">
               <el-input v-model="form.phone" placeholder="请输入" maxlength="11"/>
@@ -334,6 +357,7 @@ export default {
         houseUserName: undefined,
         idCard: undefined,
         phone: undefined,
+        source: undefined,
       },
       // 表单参数
       form: {},
@@ -467,11 +491,15 @@ export default {
     resetQuery() {
       this.queryParams= {
         pageNum: 1,
-          pageSize: 10,
-          areaId: undefined,
-          buildingId: undefined,
-          unitId: undefined,
-          name: undefined,
+        pageSize: 10,
+        areaId: undefined,
+        buildingId: undefined,
+        unitId: undefined,
+        name: undefined,
+        houseUserName: undefined,
+        idCard: undefined,
+        phone: undefined,
+        source: undefined,
       };
       this.builds = []
       this.units = []

src/views/zdsz/unit/index.vue

@@ -82,11 +82,7 @@
       <el-table-column label="小区名称" align="center" prop="areaName"/>
       <el-table-column label="楼宇名称" align="center" prop="buildingName"/>
       <el-table-column label="单元名称" align="center" prop="name"/>
-      <el-table-column label="来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.community_source" :value="scope.row.source"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="来源" align="center" prop="source"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">