施工环节备注去掉 && 样式完善

src/components/ConstructionDetails/index.vue

@@ -47,12 +47,13 @@
                 v-for="(i,index) in e.zEngineeringMaterialBo || [] "
                 :key="index"
               >
-                <el-form :model="nodeInfo" class="nodeForm">
+                <el-form :model="nodeInfo" class="nodeForm materialForm">
                     <el-form-item
                       :prop="i.materialQuality"
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="材质"
                       v-show="i.materialQuality != null"
+                      label-width="95px"
                       >
                       <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
@@ -70,6 +71,7 @@
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="规格"
                       v-show="i.specifications != null"
+                      label-width="95px"
 
                       >
                       <el-select v-model="i.specifications" placeholder="请选择规格" style="width: 100%" :disabled="status == 'read-only' ">
@@ -86,6 +88,7 @@
                       :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="数量"
                       v-show="i.number != null"
+                      label-width="95px"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
                         <el-input v-model="i.number" placeholder="请输入数量" style="width: 100%" type="number" maxlength="11" :disabled="status == 'read-only'"></el-input>
@@ -96,6 +99,7 @@
                       :prop="i.corrosionLevel"
                       label="腐蚀等级"
                       v-show="i.corrosionLevel != null"
+                      label-width="95px"
 
                       >
                       <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
@@ -113,6 +117,7 @@
                       :prop="i.visitType"
                       label="上门类型"
                       v-show="i.visitType != null"
+                      label-width="95px"
 
                       >
                       <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
@@ -130,7 +135,7 @@
                       :prop="i.selfClosingValveType"
                       label="自闭阀类型"
                       v-show="i.selfClosingValveType != null"
-
+                      label-width="95px"
                       >
                       <!--                  :rules="{required: true, message: '请输入材质', trigger: 'blur'}"-->
                       <!--                  <el-input v-model="item.materialQuality" placeholder="请输入材质" style="width: 100%"/>-->
@@ -159,15 +164,19 @@
                 </el-input> -->
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
-              <ObsImageUpload
-                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
-                ref="obsImageUpload"
-                :limit="11"
-                :fileType="['png', 'jpg', 'jpeg']"
-                @input="getUrl(arguments,idx)"
-                :value="e.zEngiineeringPhotoBoList"
-                :disabled="status == 'read-only' "
-              ></ObsImageUpload>
+              <div style="display: flex;width: 100%;height: 100%;">
+                <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">图片</h3>
+                <ObsImageUpload
+                  :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                  ref="obsImageUpload"
+                  :limit="11"
+                  :fileType="['png', 'jpg', 'jpeg']"
+                  @input="getUrl(arguments,idx)"
+                  :value="e.zEngiineeringPhotoBoList"
+                  :disabled="status == 'read-only' "
+                ></ObsImageUpload>
+              </div>
+              
             <!-- </el-form-item> -->
             <hr>
           </el-collapse-item>
@@ -402,6 +411,14 @@ export default {
     display: flex;
   }
 }
+
+::v-deep .materialForm{
+  display: flex !important;
+  flex-wrap: wrap;
+  .el-form-item{
+    width: 320px;
+  }
+}
 ::v-deep .obsImageUpload{
   .el-upload--picture-card{
     display: block !important;

src/views/zdsz/engineeringCivil/index.vue

@@ -625,7 +625,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -638,7 +638,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -651,7 +651,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -664,7 +664,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -677,7 +677,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -691,7 +691,7 @@ export default {
             'backfillTime',                            // 回填时间
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -705,7 +705,7 @@ export default {
             'segmentedCompressionQualified',           // 分段打压
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -718,7 +718,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -731,7 +731,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -744,7 +744,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -777,7 +777,7 @@ export default {
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片
-            'remark',                                  // 施工内容
+            // 'remark',                                  // 施工内容
           ]
         },
         {
@@ -1263,7 +1263,7 @@ export default {
         completionStatus: undefined,
         version: undefined,
         imgUrl: undefined,
-        remark: undefined,
+        // remark: undefined,
         delFlag: undefined,
         createBy: undefined,
         createTime: undefined,

src/views/zdsz/engineeringIndustry/index.vue

@@ -143,8 +143,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="searchParams.pageNum"
+      :limit.sync="searchParams.pageSize"
       @pagination="getList"
     />
     <!-- 顶管工程新增 -->

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -127,8 +127,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="searchParams.pageNum"
+      :limit.sync="searchParams.pageSize"
       @pagination="getList"
     />
     <!-- 顶管工程新增 -->
@@ -261,19 +261,8 @@ import ConstructionDetails from "@/components/ConstructionDetails"
 
 export default {
   name: "openrepair",
-  dicts:['pass_check',
-         'is_repair',
-         'engin_type',
-         'self_closing_valve_type',
-         'visit_type','district',
-         'new_built_indoor_engin',
-         "old_renovation_indoor_engin",
-         "old_renovation_courtyard",
-         "old_renovation_overhead",
-         "new_built_indoor_engin",
-         "new_built_courtyard",
-         "new_built_overhead",
-         "engin_cycle",
+  dicts:[
+         'district',
          "engineering_infrastructure",
       ],
   components:{