底腿添加施工位置

src/components/ConstructionDetails/index.vue

@@ -108,14 +108,14 @@
 
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
-                    :prop="i.constructAddre + ''"
+                    :prop="e.constructAddre + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="位置"
-                    v-show="i.constructAddre != null"
+                    v-show="currentDicts.some(item=>item.label==='底腿')"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
-                      <el-select v-model="i.constructAddre" style="width: 100%;">
+                      <el-select v-model="e.constructAddre" style="width: 100%;" :disabled="status == 'read-only'">
                         <el-option
                           v-for="e in dict.type.construct_addre"
                           :key="e.value"
@@ -130,7 +130,7 @@
                     :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="具体位置"
-                    v-show="i.remark != null"
+                    v-show="currentDicts.some(item=>item.label==='底腿')"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
@@ -159,7 +159,7 @@
                       v-show="i.remark != null&&!currentDicts.some(item=>item.label==='底腿')"
                       >
                       <div class="block" style="display: inline-block; margin-right: 20px;">
-                        <el-input v-model="i.remark" placeholder="请输入" style="width: 100%"  maxlength="100" :disabled="status == 'read-only'"></el-input>
+                        <el-input v-model="i.remark" placeholder="请输入描述" style="width: 100%"  maxlength="100" :disabled="status == 'read-only'"></el-input>
                       </div>
                     </el-form-item>
 
@@ -484,13 +484,14 @@ export default {
       specificationsList:[],                      // 规格
       materialComponList:[],
       nodeInfo:{
-          backfillTime:'',                        // 回填时间
+          backfillTime:'',                       // 回填时间
           constructTime:'',
           constructAccordingDrawings:'',
           segmentedCompressionQualified:'',
           zEngiineeringPhotoBoList:[],            // 照片集合
           zEngineeringMaterialBo:[],              // 用料集合
           remark:'',
+        constructAddre:''
       },
       checkingInfo:{
         reviewStatus:'',               // 审核状态

src/components/EnginNodeInfo/index.vue

@@ -226,7 +226,7 @@
             <!--                  :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-select v-model="item.constructAddre" style="width: 100%;">
+              <el-select v-model="nodeInfo.constructAddre" style="width: 100%;">
                 <el-option
                   v-for="e in dict.type.construct_addre"
                   :key="e.value"
@@ -390,6 +390,7 @@ export default {
         zEngiineeringPhotoBoList:[],            // 照片集合
         zEngineeringMaterialBo:[],              // 用料集合
         remark:'',
+        constructAddre:''
       },
       nodeInfoBo:{
         zEngineeringInfoBo:{
@@ -508,6 +509,7 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.constructionRecords=this.nodeInfo.constructionRecords
           this.nodeInfoBo.zEngineeringInfoBo.video=this.nodeInfo.video
           this.nodeInfoBo.zEngineeringInfoBo.zEngineeringMaterialBo = this.zEngineeringMaterialBo
+          this.nodeInfoBo.zEngineeringInfoBo.constructAddre=this.nodeInfo.constructAddre
           delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
           result = this.nodeInfoBo

src/views/zdsz/area/index.vue

@@ -179,7 +179,7 @@
                      icon="el-icon-download"
                      size="mini"
                      @click="handleUpload(scope.row)"
-                     v-hasPermi="['gas:area:edit']"
+                     v-hasPermi="['zdsz:area:edit']"
           >下载
           </el-button>
           <el-button
@@ -187,7 +187,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['gas:area:edit']"
+            v-hasPermi="['zdsz:area:edit']"
           >修改
           </el-button>
           <el-button
@@ -195,7 +195,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:area:remove']"
+            v-hasPermi="['zdsz:area:remove']"
           >删除
           </el-button>
         </template>