bug Fix

src/views/zdsz/area/index.vue

@@ -169,7 +169,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:area:edit']"
-          >编辑
+          >修改
           </el-button>
           <el-button
             size="mini"
@@ -197,12 +197,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="小区名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入小区名称" style="width: 80%;"/>
+              <el-input v-model="form.name" placeholder="请输入小区名称" style="width: 80%;" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="小区规模" prop="scale">
-              <el-input v-model="form.scale" placeholder="请输入小区规模"/>
+              <el-input v-model="form.scale" placeholder="请输入小区规模" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -552,7 +552,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除小区管理编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delArea(ids);
       }).then(() => {

src/views/zdsz/building/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名称" prop="name">
+      <el-form-item label="小区名称" prop="areaId">
         <el-select v-model="queryParams.areaId" filterable clearable placeholder="请选择小区">
           <el-option
             v-for="item in areaList"
@@ -103,7 +103,7 @@
     <!-- 添加或修改楼栋管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="小区名称" prop="name">
+        <el-form-item label="小区名称" prop="areaId">
           <el-select v-model="form.areaId" filterable clearable placeholder="请选择小区">
             <el-option
               v-for="item in areaList"
@@ -114,10 +114,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="楼宇名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入楼宇名称"/>
+          <el-input v-model="form.name" placeholder="请输入楼宇名称" maxlength="50"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="100"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -171,10 +171,10 @@ export default {
           {required: true, message: "不能为空", trigger: "blur"}
         ],
         areaId: [
-          {required: true, message: "不能为空", trigger: "change"}
+          {required: true, message: "小区不能为空", trigger: "change"}
         ],
         name: [
-          {required: true, message: "不能为空", trigger: "blur"}
+          {required: true, message: "楼宇名称不能为空", trigger: "blur"}
         ],
         remark: [
           {required: false, message: "备注不能为空", trigger: "blur"}
@@ -284,7 +284,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除楼栋管理编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delBuilding(ids);
       }).then(() => {

src/views/zdsz/enginMaterialQuality/index.vue

@@ -129,7 +129,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="材质名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入材质名称"/>
+          <el-input v-model="form.name" placeholder="请输入材质名称" maxlength="50"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -189,7 +189,7 @@ export default {
           {required: true, message: "不能为空", trigger: "blur"}
         ],
         enginType: [
-          {required: true, message: "工程类型不能为空", trigger: "change"}
+          {required: true, message: "所属工程不能为空", trigger: "change"}
         ],
         name: [
           {required: true, message: "材质名称不能为空", trigger: "blur"}
@@ -299,7 +299,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除工程材质编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delEnginMaterialQuality(ids);
       }).then(() => {

src/views/zdsz/enginSpecifications/index.vue

@@ -11,10 +11,10 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="材质名称" prop="name">
+      <el-form-item label="规格名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入材质名称"
+          placeholder="请输入规格名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -79,7 +79,7 @@
       <el-table-column type="selection" width="55" align="center"/>
 <!--      <el-table-column label="id" align="center" prop="id" v-if="true"/>-->
       <el-table-column label="材质名称" align="center" prop="materName"/>
-      <el-table-column label="材质名称" align="center" prop="name"/>
+      <el-table-column label="规格名称" align="center" prop="name"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -123,8 +123,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="材质名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入材质名称"/>
+        <el-form-item label="规格名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入规格名称" maxlength="50"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -185,7 +185,7 @@ export default {
           {required: true, message: "不能为空", trigger: "blur"}
         ],
         materId: [
-          {required: true, message: "材质id不能为空", trigger: "blur"}
+          {required: true, message: "材质不能为空", trigger: "blur"}
         ],
         name: [
           {required: true, message: "材质名称不能为空", trigger: "blur"}
@@ -298,7 +298,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除工程材质规格编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delEnginSpecifications(ids);
       }).then(() => {

src/views/zdsz/engineeringCivil/index.vue

@@ -1372,69 +1372,78 @@ export default {
       this.nodeDetailVisible = false
     },
     toNodeDetail() {
-      let nodeCollection = []
-      // 收集节点信息
-      this.currentCheckList.forEach((e, idx) => {
-        let nodeItem = this.$refs['EnginNodeInfo' + idx][0].infoCollection()
-        //  console.log(nodeItem)
-        nodeCollection.push(nodeItem)
-      })
-      this.queryParams.zEngineeringNodeBoList = nodeCollection
-      if (this.enginNodeStatus == '修改') {
-        putEngineeringCivil(this.queryParams).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '添加成功',
-              type: 'success'
-            });
-            this.open = false
-            console.log('选中节点集合', this.currentCheckList)
-            this.currentCheckList = []
-            this.getList()
-            // this.$emit('closeToSucceed')
-          }
-        })
-      } else if (this.enginNodeStatus == '添加用料') {
-        addEngineeringCivil(this.queryParams).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '添加成功',
-              type: 'success'
-            });
-            this.open = false
-            console.log('选中节点集合', this.currentCheckList)
-            this.currentCheckList = []
-            this.getList()
-            // this.$emit('closeToSucceed')
-          }
-        })
-      } else if (this.enginNodeStatus == '添加用料') {
-        addEngineeringCivil(this.queryParams).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '添加成功',
-              type: 'success'
-            });
-            this.open = false
-            console.log('选中节点集合', this.currentCheckList)
-            this.currentCheckList = []
-            // this.$emit('closeToSucceed')
-          }
-        })
-      } else {
-        addEngineeringCivil(this.queryParams).then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '新增成功',
-              type: 'success'
-            });
-            this.open = false
-            console.log('选中节点集合', this.currentCheckList)
-            this.currentCheckList = []
-            // this.$emit('closeToSucceed')
+      this.$refs.form.validate(valid => {
+        if(valid){
+          let nodeCollection = []
+          // 收集节点信息
+          this.currentCheckList.forEach((e, idx) => {
+            let nodeItem = this.$refs['EnginNodeInfo' + idx][0].infoCollection()
+            //  console.log(nodeItem)
+            nodeCollection.push(nodeItem)
+          })
+          this.queryParams.zEngineeringNodeBoList = nodeCollection
+          if (this.enginNodeStatus == '修改') {
+            putEngineeringCivil(this.queryParams).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '添加成功',
+                  type: 'success'
+                });
+                this.open = false
+                console.log('选中节点集合', this.currentCheckList)
+                this.currentCheckList = []
+                this.getList()
+                // this.$emit('closeToSucceed')
+              }
+            })
+          } else if (this.enginNodeStatus == '添加用料') {
+            addEngineeringCivil(this.queryParams).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '添加成功',
+                  type: 'success'
+                });
+                this.open = false
+                console.log('选中节点集合', this.currentCheckList)
+                this.currentCheckList = []
+                this.getList()
+                // this.$emit('closeToSucceed')
+              }
+            })
+          } else if (this.enginNodeStatus == '添加用料') {
+            addEngineeringCivil(this.queryParams).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '添加成功',
+                  type: 'success'
+                });
+                this.open = false
+                console.log('选中节点集合', this.currentCheckList)
+                this.currentCheckList = []
+                this.getList();
+                // this.$emit('closeToSucceed')
+              }
+            })
+          } else {
+            addEngineeringCivil(this.queryParams).then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '新增成功',
+                  type: 'success'
+                });
+                this.open = false
+                console.log('选中节点集合', this.currentCheckList)
+                this.currentCheckList = []
+                this.getList();
+                // this.$emit('closeToSucceed')
+              }
+            })
           }
-        })
-      }
+        } else {
+          this.$message.error(`请完善信息!`);
+        }
+      })
+      
 
       return
       getDictList({enginType: ['new_built', 'old_renovation']}).then(res => {

src/views/zdsz/engineeringMaterialsResets/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名称" prop="name">
+      <el-form-item label="小区名称" prop="areaId">
         <el-select v-model="queryParams.areaId" filterable  placeholder="请选择小区">
           <el-option
             v-for="item in areaList"
@@ -125,7 +125,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="预估尺寸" prop="estimatedSize">
-          <el-input-number  v-model="form.estimatedSize" controls-position="right" placeholder="请输入预估尺寸" style="width: 100%" />
+          <el-input-number  v-model="form.estimatedSize" controls-position="right" placeholder="请输入预估尺寸" style="width: 100%"   :max="999999999"/>
         </el-form-item>
         <el-form-item label="工程周期" prop="enginCycle">
 <!--          <el-input-number  v-model="form.enginCycle" controls-position="right" placeholder="请输入工程周期" style="width: 100%" />-->
@@ -162,7 +162,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="100" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,7 +224,7 @@ export default {
           { required: false, message: "不能为空", trigger: "blur" }
         ],
         areaId: [
-          { required: true, message: "不能为空", trigger: "change" }
+          { required: true, message: "小区不能为空", trigger: "change" }
         ],
         materialQuality: [
           { required: true, message: "材质不能为空", trigger: "change" }
@@ -363,7 +363,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除工程用料预设编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delEngineeringMaterialsResets(ids);
       }).then(() => {

src/views/zdsz/house/index.vue

@@ -150,7 +150,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="楼栋" prop="buildingId">
-              <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1">
+              <el-select v-model="form.buildingId" placeholder="请选择楼栋" filterable @change="getUnits1" style="width: 270px;">
                 <el-option
                   v-for="obj in builds"
                   :key="obj.id"
@@ -176,14 +176,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="房间号" prop="name">
-              <el-input v-model="form.name" placeholder="请输入"/>
+              <el-input v-model="form.name" placeholder="请输入" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="100"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -346,11 +346,14 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.builds = []
+      this.units = []
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+
       this.handleQuery();
     },
     // 多选框选中数据

src/views/zdsz/unit/index.vue

@@ -139,10 +139,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="单元名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入"/>
+          <el-input v-model="form.name" placeholder="请输入" maxlength="50"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input v-model="form.remark" type="textarea" maxlength="100" placeholder="请输入内容"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -198,13 +198,13 @@ export default {
           {required: true, message: "不能为空", trigger: "blur"}
         ],
         areaId: [
-          {required: true, message: "不能为空", trigger: "change"}
+          {required: true, message: "小区不能为空", trigger: "change"}
         ],
         buildingId: [
-          {required: true, message: "不能为空", trigger: "change"}
+          {required: true, message: "楼宇不能为空", trigger: "change"}
         ],
         name: [
-          {required: true, message: "不能为空", trigger: "blur"}
+          {required: true, message: "单元名称不能为空", trigger: "blur"}
         ],
         remark: [
           {required: false, message: "备注不能为空", trigger: "blur"}
@@ -325,7 +325,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除单元管理编号为"' + ids + '"的数据项？').then(() => {
+      this.$modal.confirm('是否确认删除？').then(() => {
         this.loading = true;
         return delUnit(ids);
       }).then(() => {