提交代码

src/views/zdsz/engineeringCivil/index.vue

@@ -100,17 +100,17 @@
           />
         </el-select>
       </el-form-item>
-        <el-form-item label="审核状态" prop="completionStatus">
-          <el-select v-model="queryParams1.completionStatus" placeholder="请选择审核状态" clearable
-                     :disabled="queryParams1.type==undefined||queryParams1.type==''"
-                     @clear="">
-            <el-option
-              v-for="dict in StateOptions"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
+      <el-form-item label="审核状态" prop="completionStatus">
+        <el-select v-model="queryParams1.completionStatus" placeholder="请选择审核状态" clearable
+                   :disabled="queryParams1.type==undefined||queryParams1.type==''"
+                   @clear="">
+          <el-option
+            v-for="dict in StateOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="施工时间" prop="completionStatus">
         <el-date-picker
@@ -120,19 +120,19 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          >
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="施工人" prop="completionStatus">
-<!--        <el-select v-model="queryParams1.createBy" placeholder="请选择施工人" filterable clearable-->
-<!--                   @clear="">-->
-<!--          <el-option-->
-<!--            v-for="dict in userList"-->
-<!--            :key="dict.userName"-->
-<!--            :label="dict.userName"-->
-<!--            :value="dict.userName"-->
-<!--          />-->
-<!--        </el-select>-->
+        <!--        <el-select v-model="queryParams1.createBy" placeholder="请选择施工人" filterable clearable-->
+        <!--                   @clear="">-->
+        <!--          <el-option-->
+        <!--            v-for="dict in userList"-->
+        <!--            :key="dict.userName"-->
+        <!--            :label="dict.userName"-->
+        <!--            :value="dict.userName"-->
+        <!--          />-->
+        <!--        </el-select>-->
         <el-autocomplete
           popper-class="my-autocomplete"
           v-model="queryParams1.createBy"
@@ -143,7 +143,7 @@
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.nickName }}</div>
-            <span class="addr">{{item.userName }}</span>
+            <span class="addr">{{ item.userName }}</span>
           </template>
 
         </el-autocomplete>
@@ -177,18 +177,18 @@
         >新增
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['zdsz:engineeringCivil:edit']"-->
-<!--        >修改工程信息-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['zdsz:engineeringCivil:edit']"-->
+      <!--        >修改工程信息-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -266,9 +266,12 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="(item.state == '1'||item.state == '2')" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
-              <span slot="reference" v-if="item.state == '0' && item.Type != '开栓'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
-              <span slot="reference" v-if="item.state == '0' && item.Type == '开栓'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: yellow;"></span>
+              <span slot="reference" v-if="(item.state == '1'||item.state == '2')"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
+              <span slot="reference" v-if="item.state == '0' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
+              <span slot="reference" v-if="item.state == '0' && item.Type == '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: yellow;"></span>
             </el-popover>
           </div>
         </template>
@@ -291,14 +294,14 @@
             v-hasPermi="['zdsz:engineeringCivil:xgsg']"
           >修改施工信息
           </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['zdsz:engineeringCivil:remove']"-->
-<!--          >删除-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['zdsz:engineeringCivil:remove']"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -645,7 +648,7 @@
 
       @close="checkingAllFormClosed"
     >
-      <el-form :model="batchForm" :rules="batchFormRules" ref="batchFormAll"  label-width="auto" label-position="right">
+      <el-form :model="batchForm" :rules="batchFormRules" ref="batchFormAll" label-width="auto" label-position="right">
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="行政区" prop="district">
@@ -681,63 +684,63 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-        <el-form-item label="工程类型" prop="enginType">
-          <el-select
-            v-model="batchForm.enginType"
-            placeholder="请选择工程类型"
-            @change="enginTypeHasChanged"
-          >
-            <el-option
-              v-for="e in enginTypeOption"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+            <el-form-item label="工程类型" prop="enginType">
+              <el-select
+                v-model="batchForm.enginType"
+                placeholder="请选择工程类型"
+                @change="enginTypeHasChanged"
+              >
+                <el-option
+                  v-for="e in enginTypeOption"
+                  :key="e.value"
+                  :label="e.label"
+                  :value="e.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item label="工程分类" prop="enginClassification">
-          <el-select
-            v-model="batchForm.enginClassification"
-            placeholder="请选择工程分类"
-            @change="currentCheckingAll"
-          >
-            <el-option
-              v-for="e in currentEnginTypeChangeOptions"
-              :key="e.dictValue"
-              :label="e.dictLabel"
-              :value="e.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+            <el-form-item label="工程分类" prop="enginClassification">
+              <el-select
+                v-model="batchForm.enginClassification"
+                placeholder="请选择工程分类"
+                @change="currentCheckingAll"
+              >
+                <el-option
+                  v-for="e in currentEnginTypeChangeOptions"
+                  :key="e.dictValue"
+                  :label="e.dictLabel"
+                  :value="e.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-        <el-form-item label="环节" label-width="78px" prop="type">
-          <el-select
-            v-model="batchForm.type"
-            placeholder="请选择工程分类"
-          >
-            <el-option
-              v-for="e in checkingAllList"
-              :key="e.dictValue"
-              :label="e.dictLabel"
-              :value="e.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+            <el-form-item label="环节" label-width="78px" prop="type">
+              <el-select
+                v-model="batchForm.type"
+                placeholder="请选择工程分类"
+              >
+                <el-option
+                  v-for="e in checkingAllList"
+                  :key="e.dictValue"
+                  :label="e.dictLabel"
+                  :value="e.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-<!--        <el-form-item prop="reviewTime" label="工程创建时间" style="margin-left: -5%;">-->
-<!--          <el-date-picker-->
-<!--            v-model="batchForm.reviewTime"-->
-<!--            type="month"-->
-<!--            value-format="yyyy-MM"-->
-<!--            placeholder="选择月">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
+            <!--        <el-form-item prop="reviewTime" label="工程创建时间" style="margin-left: -5%;">-->
+            <!--          <el-date-picker-->
+            <!--            v-model="batchForm.reviewTime"-->
+            <!--            type="month"-->
+            <!--            value-format="yyyy-MM"-->
+            <!--            placeholder="选择月">-->
+            <!--          </el-date-picker>-->
+            <!--        </el-form-item>-->
             <el-form-item
               label-width="78px"
               label="节点开关"
@@ -756,24 +759,24 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" style="text-align: center">
-        <el-col :span="20">
-        <el-form-item
-          label-width="78px"
-          label="内容"
-          prop="reviewContent"
-        >
-<!--          <div class="block" style="display: inline-block; margin-right: 20px;">-->
-            <el-input
-              v-model="batchForm.reviewContent"
-              placeholder="请输入内容"
-              type="textarea"
-              maxlength="255"
-              show-word-limit
-              :autosize="{ minRows: 4}"
-              style="width: 100%"/>
-<!--          </div>-->
-        </el-form-item>
-        </el-col>
+          <el-col :span="20">
+            <el-form-item
+              label-width="78px"
+              label="内容"
+              prop="reviewContent"
+            >
+              <!--          <div class="block" style="display: inline-block; margin-right: 20px;">-->
+              <el-input
+                v-model="batchForm.reviewContent"
+                placeholder="请输入内容"
+                type="textarea"
+                maxlength="255"
+                show-word-limit
+                :autosize="{ minRows: 4}"
+                style="width: 100%"/>
+              <!--          </div>-->
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -862,9 +865,9 @@ export default {
       currentCollapses: [],
       enginId: undefined,
       checkingsVisible: false,
-      batchVisible:false,
+      batchVisible: false,
       updateOption: [],
-      batchFormRules:{
+      batchFormRules: {
         enginType: [
           {required: true, message: "工程类型不能为空", trigger: ['change']}
         ],
@@ -1140,7 +1143,7 @@ export default {
           name: '底腿',
           components: [
             [
-              'caliber' ,// 管径
+              'caliber',// 管径
               'specificConstruction', //具体施工位置
               'constructAddre'//位置
             ],
@@ -1161,7 +1164,7 @@ export default {
         // }
       ],
       currentCheckList: [],
-      enginType:'',
+      enginType: '',
       enginClassificationinfo: '',
       enginClassification: '',
       enginClassificationOption: [],
@@ -1251,8 +1254,8 @@ export default {
         completionStatus: undefined,
         imgUrl: undefined,
         type: undefined,
-        beginTime:[],
-        createBy:''
+        beginTime: [],
+        createBy: ''
       },
       zEngineeringInfoBo: {
         constructAddre: '',        // 施工地址
@@ -1338,18 +1341,18 @@ export default {
         reviewTime: '',
         type: '',
       },
-      batchForm:{
+      batchForm: {
         completionStatus: '',               // 审核状态
         reviewContent: '',              // 审核内容
         enginType: null,
         enginClassification: null,
         reviewTime: '',
         type: '',
-        district:'',
-        buildingId:'',
-        unitId:'',
-        areaId:'',
-        enginCycle:0
+        district: '',
+        buildingId: '',
+        unitId: '',
+        areaId: '',
+        enginCycle: 0
       },
       checkingAllList: [],
       reviewStatusList: [
@@ -1375,7 +1378,7 @@ export default {
       zEngineeringNodeBo: {},
       currentEnginName: null,
       currentCheckingEnginList: [],
-      userList:[]
+      userList: []
     };
   },
   created() {
@@ -1418,41 +1421,40 @@ export default {
     validateCHanged(e) {
       this.reviewStatusList[e].label == '通过' ? this.checkingFormRules.reviewContent[0].required = true : this.checkingFormRules.reviewContent[0].required = false
     },
-    batchAllSubmit(){
+    batchAllSubmit() {
       this.$refs.batchFormAll.validate(valid => {
-          if (valid) {
-            batchNode(this.batchForm).then(res=>{
-              if (res.code == 200) {
-                this.batchVisible = false
-                this.batchForm = {
-                  completionStatus: '',               // 审核状态
-                  reviewContent: '',              // 审核内容
-                  enginType: null,
-                  enginClassification: null,
-                  reviewTime: '',
-                  type: '',
-                  district:'',
-                  buildingId:'',
-                  unitId:'',
-                  areaId:'',
-                  enginCycle:0
-                }
-                setTimeout(()=>this.getList(),1000)
-                this.$refs.batchFormAll.resetFields()
+        if (valid) {
+          batchNode(this.batchForm).then(res => {
+            if (res.code == 200) {
+              this.batchVisible = false
+              this.batchForm = {
+                completionStatus: '',               // 审核状态
+                reviewContent: '',              // 审核内容
+                enginType: null,
+                enginClassification: null,
+                reviewTime: '',
+                type: '',
+                district: '',
+                buildingId: '',
+                unitId: '',
+                areaId: '',
+                enginCycle: 0
               }
-            })
-          } else {
-            this.$message.error('请填写必填项!')
-          }
+              setTimeout(() => this.getList(), 1000)
+              this.$refs.batchFormAll.resetFields()
+            }
+          })
+        } else {
+          this.$message.error('请填写必填项!')
+        }
       })
     },
-    listAll()
-    {
-      listAll({status:0}).then(res=>{
-        this.userList=res.data
+    listAll() {
+      listAll({status: 0}).then(res => {
+        this.userList = res.data
       })
     },
-  checkingAllSubmit() {
+    checkingAllSubmit() {
       this.$refs.checkingFormAll.validate(valid => {
         if (valid) {
           // this.checkingForm.createTime = formatDate(this.checkingForm.createTime)
@@ -1535,8 +1537,8 @@ export default {
             "value": res.data[i].dictValue,
           })
         }
-        this.zEngineeringNodeBo=e
-        this.$refs.ConstructionDetails.open(dict, null, null, '民用', title,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType,"民用工程")
+        this.zEngineeringNodeBo = e
+        this.$refs.ConstructionDetails.open(dict, null, null, '民用', title, this.zEngineeringNodeBo.enginClassification, this.zEngineeringNodeBo.enginType, "民用工程")
       })
     },
     viewNodeSource(e = null) {
@@ -1578,7 +1580,7 @@ export default {
         }
         this.zEngineeringNodeBo = e
         console.log(this.zEngineeringNodeBo)
-        this.$refs.ConstructionDetails.open(dict, _, type, '民用', title,this.zEngineeringNodeBo.enginClassification,this.enginType)
+        this.$refs.ConstructionDetails.open(dict, _, type, '民用', title, this.zEngineeringNodeBo.enginClassification, this.enginType)
         this.status = 'read-only'
       })
     },
@@ -1850,22 +1852,22 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-           this.queryParams1={
+      this.queryParams1 = {
         pageNum: 1,
-          pageSize: 10,
-          district: undefined,
-          areaId: undefined,
-          buildingId: undefined,
-          unitId: undefined,
-          houseId: undefined,
-          enginType: undefined,
-          enginClassification: undefined,
-          enginCycle: 0,
-          completionStatus: undefined,
-          imgUrl: undefined,
-          type: undefined,
-          beginTime:[],
-          createBy:''
+        pageSize: 10,
+        district: undefined,
+        areaId: undefined,
+        buildingId: undefined,
+        unitId: undefined,
+        houseId: undefined,
+        enginType: undefined,
+        enginClassification: undefined,
+        enginCycle: 0,
+        completionStatus: undefined,
+        imgUrl: undefined,
+        type: undefined,
+        beginTime: [],
+        createBy: ''
       }
       this.areaList = []
       this.buildingList = []
@@ -2069,17 +2071,26 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      if (this.queryParams1.district!=undefined&&this.queryParams1.district!=null&&this.queryParams1.district!='')
+      debugger
+      if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
+        this.$message.warning("请选择行政区")
+        return
+      }
+      if (this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '') {
+        this.$message.warning("请选择工程类型")
+        return
+      }
+      if (this.queryParams1.enginClassification == undefined || this.queryParams1.enginClassification == null || this.queryParams1.enginClassification == '') {
+        this.$message.warning("请选择工程分类")
+        return
+      }
       this.download('zdsz/engineeringCivil/export', {
         ...this.queryParams1
       }, `民用工程-${new Date().getTime()}.xlsx`)
-      else
-      {
-        this.$message.warning("请选择行政区")
-      }
     }
   }
-};
+}
+;
 </script>
 <style lang="scss" scoped>
 
@@ -2167,6 +2178,7 @@ export default {
     height: 115px;
   }
 }
+
 .my-autocomplete {
   li {
     line-height: normal;
@@ -2176,6 +2188,7 @@ export default {
       text-overflow: ellipsis;
       overflow: hidden;
     }
+
     .addr {
       font-size: 12px;
       color: #b4b4b4;