补丁

src/components/EnginNodeInfo/index.vue

@@ -0,0 +1,76 @@
+<!-- 
+ *@description: 节点信息form（新）
+ *@author: yh Fu
+ *@date: 2024-01-10 14:44:14
+ *@version: V1.0.5
+ -->
+
+
+<template>
+    <div style="width: 100%; height: 100%;">
+        <!-- 节点表单 -->
+        <el-form ref="fangxianForm" :model="fangxianInfo" :rules="nodeRules" label-width="200px" v-show="types.includes('放线')">
+            <h2 style="margin-left: 17%;font-weight: 800;">放线</h2>
+            <el-form-item label="施工时间" prop="constructTime">
+            <el-date-picker
+                :disabled="formType"
+                v-model="fangxianInfo.constructTime"
+                value-format="yyyy-MM-dd hh:mm:ss"
+                type="datetime"
+                placeholder="请选择施工时间">
+            </el-date-picker>
+            </el-form-item>
+            <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings">
+            <el-select v-model="fangxianInfo.constructAccordingDrawings" :disabled="formType">
+                <el-option
+                v-for="e in constructAccordingDrawingsOption"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+                ></el-option>
+            </el-select>
+            </el-form-item>
+            <el-form-item label="分段打压" prop="segmentedCompressionQualified">
+            <el-select v-model="fangxianInfo.segmentedCompressionQualified" :disabled="formType">
+                <el-option
+                v-for="e in segmentedCompressionQualifiedOption"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+                ></el-option>
+            </el-select>
+            </el-form-item>
+            <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 8%;display: block;">
+            <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="fangxianInfo.zEngiineeringPhotoBoList"
+                            @input="getUrl"></ObsImageUpload>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+    name:'EnginNodeInfo',
+    props:['types'],
+    data(){
+        return {
+            fangxianInfo:{
+                constructTime:'',
+                constructAccordingDrawings:'',
+                segmentedCompressionQualified:'',
+                zEngiineeringPhotoBoList:[]
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form{
+    position: relative;
+    left: -10%;
+    .el-form-item{
+        display: inline-block;
+    }
+}
+</style>

src/views/zdsz/engineeringCivil/index.vue

@@ -309,17 +309,24 @@
           <el-col :span="24">
             <el-form-item label="节点">
               <el-checkbox-group v-model="checkList">
-                <el-checkbox :label="item.dictValue" v-for="item in checkList"></el-checkbox>
+                <el-checkbox 
+                  :label="item.dictValue" 
+                  v-for="item in checkList"
+                  :key="item"
+                  ></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-tabs type="border-card">
+        <EnginNodeInfo 
+          :types="checkList"
+        />
+        <!-- <el-tabs type="border-card" >
           <el-tab-pane label="用户管理">用户管理</el-tab-pane>
           <el-tab-pane label="配置管理">配置管理</el-tab-pane>
           <el-tab-pane label="角色管理">角色管理</el-tab-pane>
           <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写节点信息</el-button>
@@ -351,9 +358,12 @@ import {getBuildingList} from "@/api/zdsz/building";
 import {getUnits} from "@/api/zdsz/unit";
 import {resetForm} from "@/utils/ruoyi";
 import {getDicts} from "@/api/system/dict/data";
+import EnginNodeInfo from "@/components/EnginNodeInfo/index";
 
 export default {
-  components: {},
+  components: {
+    EnginNodeInfo
+  },
 
   name: "EngineeringCivil",
   dicts: ['pass_check',

src/views/zdsz/engineeringIndustry/index.vue

@@ -218,7 +218,7 @@
                 <el-form-item
                   :prop="'zEngineeringMaterialBo.' + index + '.materialQuality'"
                   label-width="50px"
-                  label="材质"  :rules="{required: true, message: '请输入材质', trigger: 'blur'}">
+                  label="材质"  rules="{required: true, message: '请输入材质', trigger: 'blur'}">
                   <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>
                 </el-form-item>
               </el-col>
@@ -226,7 +226,7 @@
                 <el-form-item
                   :prop="'zEngineeringMaterialBo.' + index + '.specifications'"
                   label-width="50px"
-                  label="规格"  :rules="{required: true, message: '请输入规格', trigger: 'blur'}">
+                  label="规格"  rules="{required: true, message: '请输入规格', trigger: 'blur',}">
                   <el-input v-model="item.specifications" placeholder="请输入规格" style="width: 100%"/>
                 </el-form-item>
               </el-col>
@@ -234,7 +234,7 @@
                 <el-form-item
                   :prop="'zEngineeringMaterialBo.' + index + '.number'"
                   label-width="50px"
-                  label="数量"  :rules="{required: true, message: '请输入数量', trigger: 'change'}">
+                  label="数量"  rules="{required: true, message: '请输入数量', trigger: 'change'}">
                   <div class="block" style="display: inline-block; margin-right: 20px;">
                     <el-input v-model="item.number" placeholder="请输入数量" style="width: 100%"/>
                   </div>