bug修复

src/components/ConstructionDetails/index.vue

@@ -105,19 +105,44 @@
                       <el-input v-model="i.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" max="999999999" :disabled="status == 'read-only'"></el-input>
                     </div>
                   </el-form-item>
-                    <el-form-item
-                      v-else
-                      :prop="i.number + ''"
-                      :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%"  oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"  max="999999999" :disabled="status == 'read-only'"> <template slot="append">米</template></el-input>
 
-                      </div>
-                    </el-form-item>
+                  <el-form-item
+                    v-if="currentDicts.some(item=>item.label==='底腿')"
+                    :prop="i.constructAddre + ''"
+                    :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
+                    label="位置"
+                    v-show="i.constructAddre != null"
+                    label-width="95px"
+                  >
+                    <div class="block" style="display: inline-block; margin-right: 20px;">
+                      <el-input v-model="i.constructAddre" placeholder="请选择位置" style="width: 100%"   :disabled="status == 'read-only'"></el-input>
+                    </div>
+                  </el-form-item>
+                  <el-form-item
+                    v-if="currentDicts.some(item=>item.label==='底腿')"
+                    :prop="i.remark + ''"
+                    :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
+                    label="具体位置"
+                    v-show="i.remark != null"
+                    label-width="95px"
+                  >
+                    <div class="block" style="display: inline-block; margin-right: 20px;">
+                      <el-input v-model="i.remark" placeholder="请输入具体位置" style="width: 100%"  :disabled="status == 'read-only'"></el-input>
+                    </div>
+                  </el-form-item>
+<!--                    <el-form-item-->
+<!--                      v-else-->
+<!--                      :prop="i.number + ''"-->
+<!--                      :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%"  oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"  max="999999999" :disabled="status == 'read-only'"> <template slot="append">米</template></el-input>-->
+
+<!--                      </div>-->
+<!--                    </el-form-item>-->
 
 
                     <el-form-item
@@ -265,6 +290,18 @@
                 :disabled="status == 'read-only' "
               ></ObsVideoUpload>
             </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="node==='下沟'">
+              <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="getconstructionRecordsUrl(arguments,idx)"
+                :value="e.constructionRecords"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
             <div style="display: flex;width: 100%;height: 100%;" v-if="node==='回填'">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">石粉回填照片</h3>
               <ObsImageUpload
@@ -715,7 +752,12 @@ export default {
   getVideoUrl(_,idx) {
     this.currentCollapses[idx].video = [...arguments][0][0].map(e=>e.url) || [];
     console.log(this.currentCollapses[idx].video)
-  }
+  },
+    getconstructionRecordsUrl(_,idx)
+    {
+      this.currentCollapses[idx].constructionRecords = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].constructionRecords)
+    }
   }
 }
 </script>

src/components/EnginNodeInfo/index.vue

@@ -29,16 +29,16 @@
           placeholder="请选择回填日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="是否按图纸施工" prop="constructAccordingDrawings" v-if="currentContain.includes('constructAccordingDrawings')">
-        <el-select v-model="nodeInfo.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="constructAccordingDrawings" v-if="currentContain.includes('constructAccordingDrawings')">-->
+<!--        <el-select v-model="nodeInfo.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" v-if="currentContain.includes('segmentedCompressionQualified')">
         <el-select v-model="nodeInfo.segmentedCompressionQualified" :disabled="formType">
           <el-option
@@ -85,10 +85,15 @@
         <ObsImageUpload ref="inferiorSulcus" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.inferiorSulcus"
                         @input="getinferiorSulcusUrl"></ObsImageUpload>
       </el-form-item>
+
       <el-form-item label="视频" prop="Video" v-if="currentContain.includes('Video')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsVideoUpload ref="Video" :limit="9999" :fileType="['mp4']" :value="nodeInfo.video"
                         @input="getVideoUrl"></ObsVideoUpload>
       </el-form-item>
+      <el-form-item label="管道施工记录" prop="constructionRecords" v-if="currentContain.includes('constructionRecords')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="constructionRecords" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.constructionRecords"
+                        @input="getconstructionRecordsUrl"></ObsImageUpload>
+      </el-form-item>
       <el-form-item label="备注" prop="remark" v-if="currentContain.includes('remark')">
         <el-input
           v-model="nodeInfo.remark"
@@ -187,28 +192,61 @@
         </el-col>
         <!-- end -->
         <el-col :span="7" v-if="materialComponList.includes('number')">
+<!--          <el-form-item-->
+<!--            :prop="'zEngineeringMaterialBo.' + index + '.number'"-->
+<!--            label-width="50px"-->
+<!--            label="米数"-->
+<!--          >-->
+<!--            &lt;!&ndash;                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"&ndash;&gt;-->
+<!--            <div class="block" style="display: inline-block; margin-right: 20px;">-->
+<!--              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>-->
+
+<!--            </div>-->
+<!--          </el-form-item>-->
+        </el-col>
+        <el-col :span="7" v-if="materialComponList.includes('caliber')">
           <el-form-item
             :prop="'zEngineeringMaterialBo.' + index + '.number'"
             label-width="50px"
-            label="米数"
+            label="管径"
           >
             <!--                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"-->
             <div class="block" style="display: inline-block; margin-right: 20px;">
-              <el-input v-model="item.number" placeholder="请输入米数" style="width: 100%" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''" :disabled="status == 'read-only'"><template slot="append">米</template></el-input>
-
+<!--              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" :disabled="status == 'read-only'"></el-input-number>-->
+              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" max="999999" precision="1" :controls="false" :disabled="status == 'read-only'"></el-input-number>
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="7" v-if="materialComponList.includes('caliber')">
+        <el-col :span="7" v-if="materialComponList.includes('constructAddre')">
           <el-form-item
-            :prop="'zEngineeringMaterialBo.' + index + '.number'"
+            :prop="'zEngineeringMaterialBo.' + index + '.constructAddre'"
             label-width="50px"
-            label="管径"
+            label="位置"
           >
             <!--                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"-->
             <div class="block" style="display: inline-block; margin-right: 20px;">
-<!--              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" :disabled="status == 'read-only'"></el-input-number>-->
-              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" max="999999" precision="1" :controls="false" :disabled="status == 'read-only'"></el-input-number>
+              <!--              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" :disabled="status == 'read-only'"></el-input-number>-->
+              <el-select v-model="item.constructAddre" style="width: 100%;">
+                <el-option
+                  v-for="e in dict.type.construct_addre"
+                  :key="e.value"
+                  :label="e.label"
+                  :value="e.value"
+                ></el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7" v-if="materialComponList.includes('specificConstruction')">
+          <el-form-item
+            :prop="'zEngineeringMaterialBo.' + index + '.remark'"
+            label-width="100px"
+            label="具体施工位置"
+          >
+            <!--                  :rules="[{required: true, message: '请输入数量', trigger: 'change'},{validator: [checkPositiveInteger], trigger: 'blur'}]"-->
+            <div class="block" style="display: inline-block; margin-right: 20px;">
+              <!--              <el-input-number v-model="item.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" :disabled="status == 'read-only'"></el-input-number>-->
+              <el-input v-model="item.remark" placeholder="请输入具体施工位置" style="width: 100%"  :controls="false" :disabled="status == 'read-only'"></el-input>
             </div>
           </el-form-item>
         </el-col>
@@ -311,7 +349,8 @@ export default {
   dicts:[
     'visit_type',
     'self_closing_valve_type',
-    'brand'
+    'brand',
+    'construct_addre'
 
   ],
   components:{ObsVideoUpload},
@@ -466,7 +505,8 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.beforeBottom=this.nodeInfo.beforeBottom
           this.nodeInfoBo.zEngineeringInfoBo.inferiorSulcus=this.nodeInfo.inferiorSulcus
           this.nodeInfoBo.zEngineeringInfoBo.legBackfilling=this.nodeInfo.legBackfilling
-          this.nodeInfoBo.zEngineeringInfoBo.Video=this.nodeInfo.Video
+          this.nodeInfoBo.zEngineeringInfoBo.constructionRecords=this.nodeInfo.constructionRecords
+          this.nodeInfoBo.zEngineeringInfoBo.video=this.nodeInfo.video
           this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
           delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
@@ -513,6 +553,9 @@ export default {
     getstonePowderUrl(url) {
       this.nodeInfo.stonePowder = this.$refs.stonePowder.fileList ? this.$refs.stonePowder.fileList.map(e=>e.url):[];
     },
+    gettrenchProspectUrl(url) {
+      this.nodeInfo.trenchProspect = this.$refs.trenchProspect.fileList ? this.$refs.trenchProspect.fileList.map(e=>e.url):[];
+    },
     getwarningtTapeUrl(url) {
       this.nodeInfo.warningtTape = this.$refs.warningtTape.fileList ? this.$refs.warningtTape.fileList.map(e=>e.url):[];
     },
@@ -528,6 +571,9 @@ export default {
     getinferiorSulcusUrl(url) {
       this.nodeInfo.inferiorSulcus = this.$refs.inferiorSulcus.fileList ? this.$refs.inferiorSulcus.fileList.map(e=>e.url):[];
     },
+    getconstructionRecordsUrl(url) {
+      this.nodeInfo.constructionRecords = this.$refs.constructionRecords.fileList ? this.$refs.constructionRecords.fileList.map(e=>e.url):[];
+    },
     getVideoUrl(url) {
       this.nodeInfo.video = this.$refs.Video.fileList ? this.$refs.Video.fileList.map(e=>e.url):[];
     },

src/views/zdsz/engineeringCivil/index.vue

@@ -945,6 +945,7 @@ export default {
               // 'number',                                // 数量
             ],
             'ductalEpithelium',                       // 材质
+            'constructionRecords',
             'trenchProspect',
             'constructTime',
             'Video'// 施工时间
@@ -1087,7 +1088,9 @@ export default {
           name: '底腿',
           components: [
             [
-              'caliber'                              // 管径
+              'caliber' ,// 管径
+                'specificConstruction', //具体施工位置
+              'constructAddre'//位置
             ],
             'constructTime',
             'beforeBottom',
@@ -1095,14 +1098,14 @@ export default {
             'inferiorSulcus',                // 照片
           ]
         },
-        {
-          name: '管道施工记录',
-          components: [
-            [],
-            'constructTime',
-            'zEngiineeringPhotoBoList',                // 照片
-          ]
-        }
+        // {
+        //   name: '管道施工记录',
+        //   components: [
+        //     [],
+        //     'constructTime',
+        //     'zEngiineeringPhotoBoList',                // 照片
+        //   ]
+        // }
       ],
       currentCheckList: [],
       enginType:'',

src/views/zdsz/engineeringMaterialsResets/index.vue

@@ -229,9 +229,9 @@ export default {
         materialQuality: [
           { required: true, message: "材质不能为空", trigger: "change" }
         ],
-        estimatedSpecifications: [
-          { required: true, message: "规格不能为空", trigger: "change" }
-        ],
+        // estimatedSpecifications: [
+        //   { required: true, message: "规格不能为空", trigger: "change" }
+        // ],
         estimatedSize: [
           { required: true, message: "预估尺寸不能为空", trigger: "blur" }
         ],