修改

src/components/ConstructionDetails/index.vue

@@ -50,13 +50,13 @@
                 <el-form :model="nodeInfo" class="nodeForm">
                     <el-form-item
                       :prop="i.materialQuality"
-                      label-width="50px"
+                      label-width="100px"
                       label="材质"
                       v-show="i.materialQuality != null"
                       >
                       <!--                  :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)" :disabled="status == 'read-only' ">
+                      <el-select  v-model="i.materialQuality" placeholder="请选择材质" style="width: 100%" @change="getEnginSpecificationsList(i, index)" :disabled="status == 'read-only' ">
                           <el-option
                           v-for="e in materialQualityList"
                           :key="e.id"
@@ -67,7 +67,7 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.specifications"
-                      label-width="50px"
+                      label-width="100px"
                       label="规格"
                       v-show="i.specifications != null"
 
@@ -83,12 +83,12 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.number + ''"
-                      label-width="50px"
+                      label-width="100px"
                       label="数量"
                       v-show="i.number != null"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
-                          <el-input v-model="i.number" placeholder="请输入数量" style="width: 100%" type="number" :disabled="status == 'read-only' "/>
+                        <el-input v-model="i.number" placeholder="请输入数量" style="width: 100%" type="number" maxlength="11" :disabled="status == 'read-only'"></el-input>
                       </div>
                     </el-form-item>
 

src/views/zdsz/engineeringIndustry/index.vue

@@ -115,7 +115,7 @@
             size="mini"
             v-hasPermi="['zdsz:engineeringIndustry:query']"
             @click="viewSource(scope.row)"
-          >历史
+          >历史用料
           </el-button>
           <el-button
             size="mini"
@@ -193,7 +193,7 @@
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="files" v-if="queryParams.id" style="width: 100%">
+            <el-form-item label="附件" prop="files" v-if="form.id" style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
                              :value="form.pics"
@@ -572,7 +572,6 @@ export default {
       });
     },
     updateMaterBo() {
-      this.form.files = this.form.pics
       this.form.zEngineeringNodeBo = []
       if (this.zEngineeringMaterialBo.length > 0) {
         let valid = true;

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -81,7 +81,7 @@
               icon="el-icon-edit"
               @click="addNodeInfo(scope.row)"
               v-hasPermi="['zdsz:engineeringInfrastructure:add']"
-              >填写节点信息
+              >修改节点信息
           </el-button>
           <el-button
             size="mini"
@@ -545,48 +545,22 @@ export default {
         enginName: [
           { required: true, message: "工程名称不能为空" ,trigger: 'blur'}
         ],
-        supervisionUnit: [
-          { required: true, message: "监理单位不能为空" ,trigger: 'blur'}
-        ],
-        district: [
-          { required: true, message: "现场负责人不能为空" ,trigger: 'blur'}
-        ],
-        supervisionPhone: [
-          { required: true, message: "建立联系电话不能为空" ,trigger: 'blur'}
-        ],
-        constructUnit: [
-          { required: true, message: "建筑单位不能为空" ,trigger: 'blur'}
-        ],
-        areaId: [
-          { required: true, message: "设计负责人不能为空" ,trigger: 'blur'}
-        ],
-        plannedDuration: [
-          { required: true, message: "设计单位不能为空" ,trigger: 'blur'}
-        ],
-        designPhone: [
-          { required: true, message: "联系方式不能为空" ,trigger: 'blur'}
-        ],
-        supervisionHead: [
-          { required: true, message: "监理负责人不能为空" ,trigger: 'blur'}
-        ],
         constructUnit: [
-          { required: true, message: "建设单位不能为空", trigger: "blur" }
+          { required: true, message: "建设单位不能为空" ,trigger: 'blur'}
         ],
-        unitId: [
-          { required: true, message: "单元不能为空", trigger: "change" }
+        startTime: [
+          { required: true, message: "开工时间不能为空", trigger: "change" }
         ],
-        houseId: [
-          { required: true, message: "房间不能为空", trigger: "change" }
+        completedTime: [
+          { required: true, message: "竣工时间不能为空", trigger: "change" }
         ],
-        type: [
-          { required: false, message: "类型不能为空", trigger: "change" }
+        plannedDuration: [
+          { required: true, message: "计划工期不能为空", trigger: "blur" }
         ],
-        isQualified: [
-          { required: true, message: "安检是否合格不能为空", trigger: "blur" }
+        enginContent: [
+          { required: true, message: "工程内容不能为空", trigger: "blur" }
         ],
-      //  enginContent: [
-      //     { required: false, message: "备注不能为空", trigger: "blur" }
-      //   ],
+
       },
       // 节点规则校验
       nodeRules:{
@@ -812,7 +786,7 @@ export default {
   onClose(){
     console.log(this.currentCheckList)
     this.currentCheckList = []
-    this.$refs.nodeForm.resetFields()
+    this.$refs['form'].resetFields()
   },
   closeToSucceed(){
     this.open = false;
@@ -878,27 +852,35 @@ export default {
          delete nodeItem.zEngiineeringPhotoBoList
          nodeCollection.push(nodeItem)
       })
-      this.queryParams.files = this.$refs['obsFileUpload'].fileList;
       this.queryParams.zEngineeringNodeBoList = nodeCollection
       console.log('queryParams',this.queryParams)
       if (this.title == '修改基建工程') {
-        let param = this.queryParams
-        delete param.zEngineeringNodeBo
-        putEngineeringInfrastructure(param).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')
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            this.queryParams.files = this.$refs['obsFileUpload'].fileList;
+            if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
+              this.$message.warning('必须上传文件!')
+              return
+            }
+            let param = this.queryParams
+            delete param.zEngineeringNodeBo
+            putEngineeringInfrastructure(param).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 == '添加用料'){
-        // delete this.queryParams.id
+        this.queryParams.files = this.$refs['obsFileUpload'].fileList;
         addEngineeringInfrastructure(this.queryParams).then(res => {
           if(res.code == 200){
             this.$message({
@@ -908,22 +890,33 @@ export default {
             this.open = false
             console.log('选中节点集合',this.currentCheckList)
             this.currentCheckList = []
+            this.getList()
             // this.$emit('closeToSucceed')
           }
         })
       }else{
-        addEngineeringInfrastructure(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) {
+            this.queryParams.files = this.$refs['obsFileUpload'].fileList;
+            if (this.$refs.obsFileUpload.fileList==null||this.$refs.obsFileUpload.fileList.length===0){
+              this.$message.warning('必须上传文件!')
+              return
+            }
+            addEngineeringInfrastructure(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')
+              }
+            })
           }
-        })
+        });
       }
       return
       getDictList({enginType:['engineering_infrastructure']}).then(res => {