危险作业工程页面

src/api/rules.js

@@ -26,3 +26,17 @@ export function validPhoneMobile(rule, value, callback){
     callback();
   }
 }
+export function checkPositiveDecimal(rule, value, callback) {
+  if (value) {
+    value += ''
+    // if(/(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(value)) {
+    // if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(value)) {
+    if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]{1,2}$)/.test(value)) {
+      callback()
+    } else {
+      callback(new Error('只能输入数字,且数值不能为负,小数限2位'))
+    }
+  } else {
+    callback()
+  }
+}

src/views/zdsz/engineeringDangerous/index.vue

@@ -172,17 +172,17 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业基本信息" prop="basicInformation">
-              <el-input v-model="form.basicInformation" placeholder="请填写作业基本信息"></el-input>
+              <el-input v-model="form.basicInformation" placeholder="请填写作业基本信息" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工程名称" prop="enginName">
-              <el-input v-model="form.enginName" placeholder="请填写作业基本信息"></el-input>
+              <el-input v-model="form.enginName" placeholder="请填写作业基本信息" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工程地点" prop="enginAddre">
-              <el-input v-model="form.enginAddre" placeholder="请填写工程地点"></el-input>
+              <el-input v-model="form.enginAddre" placeholder="请填写工程地点" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -201,46 +201,46 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="现场负责人" prop="siteHead">
-              <el-input v-model="form.siteHead" placeholder="请填写现场负责人"/>
+              <el-input v-model="form.siteHead" placeholder="请填写现场负责人" maxlength="16"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="现场负责人电话" prop="siteHeadPhone">
-              <el-input v-model="form.siteHeadPhone" placeholder="请填写现场负责人电话"/>
+              <el-input v-model="form.siteHeadPhone" placeholder="请填写现场负责人电话" maxlength="11"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业人员信息" prop="operatorInformation">
-              <el-input v-model="form.operatorInformation" placeholder="请填写作业人员信息"/>
+              <el-input v-model="form.operatorInformation" placeholder="请填写作业人员信息" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="监理旁站记录" prop="supervisionRecord">
-              <el-input v-model="form.supervisionRecord" placeholder="请填写监理旁站记录"/>
+              <el-input v-model="form.supervisionRecord" placeholder="请填写监理旁站记录" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工作联系单" prop="workContactForm">
-              <el-input v-model="form.workContactForm" placeholder="请填写工作联系单"/>
+              <el-input v-model="form.workContactForm" placeholder="请填写工作联系单" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="巡线确认单" prop="linePatrolConfirmationForm">
-              <el-input v-model="form.linePatrolConfirmationForm" placeholder="请填写巡线确认单"/>
+              <el-input v-model="form.linePatrolConfirmationForm" placeholder="请填写巡线确认单" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业位置" prop="taskPosition">
-              <el-input v-model="form.taskPosition" placeholder="请填写作业位置"/>
+              <el-input v-model="form.taskPosition" placeholder="请填写作业位置" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="相关阀门位置" prop="valvePosition">
-              <el-input v-model="form.valvePosition" placeholder="请填写与作业相关阀门位置"/>
+              <el-input v-model="form.valvePosition" placeholder="请填写与作业相关阀门位置" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -259,29 +259,29 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="管径" prop="pipeDiameter">
-              <el-input v-model="form.pipeDiameter" placeholder="请填写管径"></el-input>
+              <el-input v-model="form.pipeDiameter" placeholder="请填写管径" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管材" prop="tubularProduct">
-              <el-input v-model="form.tubularProduct" placeholder="请填写管材"></el-input>
+              <el-input v-model="form.tubularProduct" placeholder="请填写管材" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="管道压力" prop="pipePressure">
-              <el-input v-model="form.pipePressure" placeholder="请填写管道压力"></el-input>
+              <el-input v-model="form.pipePressure" placeholder="请填写管道压力" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="压力报告" prop="stressReport">
-              <el-input v-model="form.stressReport" placeholder="请填写压力报告"/>
+              <el-input v-model="form.stressReport" placeholder="请填写压力报告" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="气流方向" prop="gasSourceDirection">
-              <el-input v-model="form.gasSourceDirection" placeholder="请填写气流方向"/>
+              <el-input v-model="form.gasSourceDirection" placeholder="请填写气流方向" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -300,80 +300,80 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="管道支护" prop="pipelineSupport">
-              <el-input v-model="form.pipelineSupport" placeholder="请填写管道支护"/>
+              <el-input v-model="form.pipelineSupport" placeholder="请填写管道支护" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检口" prop="inspectionPort">
-              <el-input v-model="form.inspectionPort" placeholder="请填写检口"/>
+              <el-input v-model="form.inspectionPort" placeholder="请填写检口" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="管道刷油" prop="pipelinePainting">
-              <el-input v-model="form.pipelinePainting" placeholder="请填写管道刷油"/>
+              <el-input v-model="form.pipelinePainting" placeholder="请填写管道刷油" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管道防腐" prop="pipelineCorrosionProtection">
-              <el-input v-model="form.pipelineCorrosionProtection" placeholder="请填写管道防腐"/>
+              <el-input v-model="form.pipelineCorrosionProtection" placeholder="请填写管道防腐" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="其他管道情况" prop="otherPipelineConditionsWorkPit">
-              <el-input v-model="form.otherPipelineConditionsWorkPit" placeholder="请填写其他管道情况"/>
+              <el-input v-model="form.otherPipelineConditionsWorkPit" placeholder="请填写其他管道情况" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="保护井" prop="protectionWell">
-              <el-input v-model="form.protectionWell" placeholder="请填写保护井"/>
+              <el-input v-model="form.protectionWell" placeholder="请填写保护井" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="管件保护井砌筑" prop="pipeProtectionWelMasonry">
-              <el-input v-model="form.pipeProtectionWelMasonry" placeholder="请填写管件保护井砌筑"/>
+              <el-input v-model="form.pipeProtectionWelMasonry" placeholder="请填写管件保护井砌筑" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="砌筑阀门井" prop="masonryValveWell">
-              <el-input v-model="form.masonryValveWell" placeholder="请填写砌筑阀门井"/>
+              <el-input v-model="form.masonryValveWell" placeholder="请填写砌筑阀门井" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业坑(长)" prop="hazardousWorkPitsLong">
-              <el-input v-model="form.hazardousWorkPitsLong" placeholder="请填写危险作业坑大小(长)"/>
+              <el-input v-model="form.hazardousWorkPitsLong" placeholder="请填写危险作业坑大小(长)" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业坑(宽)" prop="hazardousWorkPitsWide">
-              <el-input v-model="form.hazardousWorkPitsWide" placeholder="请填写危险作业坑大小(宽)"/>
+              <el-input v-model="form.hazardousWorkPitsWide" placeholder="请填写危险作业坑大小(宽)" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业坑(深)" prop="hazardousWorkPitsDeep">
-              <el-input v-model="form.hazardousWorkPitsDeep" placeholder="请填写危险作业坑大小(深)"/>
+              <el-input v-model="form.hazardousWorkPitsDeep" placeholder="请填写危险作业坑大小(深)" maxlength="11"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="回填" prop="backfill">
-              <el-input v-model="form.backfill" placeholder="请填写回填"/>
+              <el-input v-model="form.backfill" placeholder="请填写回填" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="夯实" prop="tamp">
-              <el-input v-model="form.tamp" placeholder="请填写夯实"/>
+              <el-input v-model="form.tamp" placeholder="请填写夯实" maxlength="200"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="平整场地" prop="levelingTheSite">
-              <el-input v-model="form.levelingTheSite" placeholder="请填写平整场地"/>
+              <el-input v-model="form.levelingTheSite" placeholder="请填写平整场地" maxlength="200"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -385,17 +385,18 @@
                 type="textarea"
                 placeholder="请输入内容"
                 class="remark_input"
+                maxlength="200"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="" v-if="currentType=='put'">
+            <el-form-item label="附件" prop="" v-if="currentType==='put'">
               <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="form.pics"
               ></ObsFileUpload>
             </el-form-item>
-            <el-form-item label="附件" prop="" v-if="currentType==null">
+            <el-form-item label="附件" prop="" v-if="currentType==='add'">
               <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"  :value="form.files"
               ></ObsFileUpload>
             </el-form-item>
@@ -423,17 +424,11 @@ import {
   getEngineeringDangerous,
   delEngineeringDangerous,
 } from "@/api/zdsz/engineeringDangerous";
-import {
-  listComprehensive,
-  getComprehensive,
-  delComprehensive,
-  addComprehensive,
-  updateComprehensive
-} from "@/api/zdsz/comprehensive";
 import EngineeNode from "@/components/EngineeNode/index";
-import {addEngineeEngineeIndustry, EditEngineeEngineeIndustry} from "@/api/zdsz/engineeringIndustry";
 import data from "@/views/system/dict/data.vue";
 import EngineePipe from '@/components/EngineePipe'
+import {validPhoneMobile,checkPositiveDecimal} from "@/api/rules";
+
 
 export default {
   name: "EngineeringDangerous",
@@ -566,6 +561,22 @@ export default {
         enginTime: [
           {required: true, message: "工程时间不能为空", trigger: "blur"}
         ],
+        hazardousWorkPitsLong: [
+          //{required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"},
+          {validator: checkPositiveDecimal, trigger: 'blur'},
+        ],
+        hazardousWorkPitsWide: [
+          //{required: true, message: "危险作业坑大小(宽)不能为空", trigger: "blur"},
+          {validator: checkPositiveDecimal, trigger: 'blur'},
+        ],
+        hazardousWorkPitsDeep: [
+          //{required: true, message: "危险作业坑大小(深)不能为空", trigger: "blur"},
+          {validator: checkPositiveDecimal, trigger: 'blur'},
+        ],
+        siteHeadPhone: [
+         // {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
+          {validator: validPhoneMobile, trigger: 'blur'},
+        ],
         /*   pipeDiameter: [
              {required: true, message: "管径不能为空", trigger: "blur"}
            ],
@@ -653,9 +664,6 @@ export default {
            levelingTheSite: [
              {required: true, message: "平整场地不能为空", trigger: "blur"}
            ],*/
-        /* remark: [
-           {required: true, message: "备注不能为空", trigger: "blur"}
-         ],*/
       },
       // 节点规则校验
       nodeRules: {
@@ -690,15 +698,6 @@ export default {
       this.open = false;
       this.getList()
     },
-    /*添加节点信息*/
-    /*  toNodeDetail(){
-        this.nodeDetailVisible = true
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.nodeDetailVisible = true
-          }
-        })
-      },*/
     toNodeDetail() {
       if (this.currentType === 'put') {
         this.form.files = this.$refs.obsFileUpload.fileList
@@ -712,9 +711,12 @@ export default {
       // this.queryParams.zEngineeringNodeBo.type = this.enginClassification
       // this.queryParams.enginClassification = result
       // console.log(this.queryParams)
-      this.form.files = this.$refs.obsFileUpload.fileList
-      this.$refs.childNode.open(this.form, 3)
-
+      if (this.currentType === 'add') {
+        this.form.files = this.$refs.obsFileUpload.fileList
+        this.$refs.childNode.open(this.form, 3)
+        this.currentType = null
+        return
+      }
       return
       this.$refs['form'].validate(e => {
         if (e) {
@@ -818,8 +820,10 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.currentType = "add"
       this.open = true;
       this.title = "添加危险工程";
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -830,40 +834,10 @@ export default {
         this.loading = false;
         this.form = response.data;
         this.currentType = "put"
-        /*  this.zEngineeringInfoBo.type = response.data.zEngineeringNodeBo.type
-          this.zEngineeringInfoBo =response.data.zEngineeringNodeBo.zEngineeringInfoBoList[0]*/
         this.open = true;
         this.title = "修改危险工程";
       });
     },
-    /** 提交按钮 */
-    /*  submitForm() {
-        this.$refs["nodeForm"].validate(valid => {
-          if (valid) {
-            if (this.form.id == null){
-              this.form.zEngineeringNodeBo = {}
-              this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
-              this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList
-              addEngineeringDangerous(this.form).then(res => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.nodeDetailVisible = false
-                this.getList();
-              })
-            }else {
-              this.form.zEngineeringNodeBo = {}
-              this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
-              this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList
-              updateEngineeringDangerous(this.form).then(res=>{
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.nodeDetailVisible = false
-                this.getList();
-              })
-            }
-          }
-        });
-      },*/
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -881,7 +855,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/engineeringDangerous/export', {
+      this.download('zdsz/engineeringDangerous/export', {
         ...this.queryParams
       }, `engineeringDangerous_${new Date().getTime()}.xlsx`)
     }