土建出图修改

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/Civil/EngineeringInfoVO.java

@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 public class EngineeringInfoVO extends TjCivilEngineering {
 
     private Long areaId;
-
+    private Long countryId;
     private List<TjElevatorVo> elevatorList;
 
     private List<TjElevatorFloorPara> floorParamList;

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/TjCivilEngineeringMapper.xml

@@ -40,6 +40,7 @@
     <resultMap type="com.ruoyi.project.business.domain.vo.Civil.EngineeringInfoVO" id="EngineeringInfoVOResult"
         extends="TjCivilEngineeringResult">
         <result property="areaId" column="area_id"/>
+        <result property="countryId" column="country_id"/>
     </resultMap>
 
     <resultMap type="com.ruoyi.project.business.domain.vo.Civil.TjCivilEngineeringVo" id="collectionResult">
@@ -251,7 +252,8 @@
                q.quotation_no,
                q.version,
                t.elevator_position,
-               p.area_id
+               p.area_id,
+               p.country_id
         from tj_civil_engineering ce
                  left join tc_project p on ce.project_id = p.project_id
                  left join tb_country c on p.country_id = c.country_id

ruoyi-ui-vue2/src/views/civil/engineering/index.vue

@@ -59,7 +59,7 @@
             <el-button v-hasPermi="['civil:engineering:download']" v-if="row.status == '2' && row.dwgFilePath" size="mini" type="text" icon="el-icon-download"
                        @click="handleDownload(row.dwgFilePath)">DWG{{ $t('common.download') }}
             </el-button>
-            <el-button v-if="row.status == '3'" size="mini" type="text" icon="el-icon-edit"
+            <el-button  size="mini" type="text" icon="el-icon-edit"
                        @click="handleAgain(row)">{{$t('engineering.again')}}
             </el-button>
           </template>

ruoyi-ui-vue2/src/views/civil/engineering/plot-add.vue

@@ -182,6 +182,7 @@ export default {
     this.id = this.$route.query && this.$route.query.id ? this.$route.query.id : null;
     if(this.id){
       await this.getEngineering();
+      this.templateChange({value:this.form.templateId})
     }
   },
   activated() {
@@ -215,9 +216,9 @@ export default {
         // if (this.form.version) {
         //   this.versionList = [{value: this.form.version, label: this.form.version}]
         // }
-        let project = this.projectList.find(item => item.value == this.form.projectId)
-        this.areaId = project.areaId;
-        this.countryId = project.countryId;
+        // let project = this.projectList.find(item => item.value == this.form.projectId)
+        this.areaId = this.form.areaId;
+        this.countryId = this.form.countryId;
       })
       this.fullLoading = false;
     },
@@ -320,6 +321,7 @@ export default {
             elevatorQuantity: item.elevatorQuantity
           }
         })
+       
       })
     },
     templateChange(row) {
@@ -490,9 +492,11 @@ export default {
             this.$modal.msgError(this.$t('elevator.required'));
             return;
           }
+          debugger
           // 电梯数量大于1时
           if (this.elevatorTableList.length > 1) {
             // 校验数量
+            
             if (this.elevatorTableList.length != this.elevatorCount) {
               this.$modal.msgError(this.$t('elevator.countError'));
               return;