merge fix

src/views/home/component/params/params1.vue

@@ -2,10 +2,12 @@
   <div class='flex flex-justify-start flex-align-center flex-col'>
     <div class='flex flex-center full-width flex-justify-between mt-10 mb-10'>
       <span class='full-width text-left bold'>{{ info.dictValue }}</span>
-      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑':'保 存'}}</el-button>
+      <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑' : '保 存' }}</el-button>
     </div>
     <div class='mt-10' style='width: 80%;'>
+      {{ form }}
       <el-form
+          v-if='form'
           :model="form"
           label-width='240px'
           :disabled='disabled'
@@ -17,7 +19,7 @@
             <el-input v-model="form.name"/>
           </el-form-item>
           <el-form-item label="总投资金额（万元）" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.totalAmount"/>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
@@ -34,12 +36,12 @@
             <el-input v-model="form.name"/>
           </el-form-item>
           <el-form-item label="责任领导" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.responsibleLeader"/>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
           <el-form-item label="项目负责人" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.projectLeader"/>
           </el-form-item>
           <el-form-item label="联系电话" style='flex:1' class='ml-20'>
             <el-input v-model="form.region"/>
@@ -57,7 +59,7 @@
 
         <div class='full-width  flex'>
           <el-form-item label="计划开工时间" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.planCommencementTime"/>
           </el-form-item>
           <el-form-item label="实际开工时间" style='flex:1' class='ml-20'>
             <el-input v-model="form.region"/>
@@ -65,7 +67,7 @@
         </div>
         <div class='full-width  flex'>
           <el-form-item label="计划入库时间" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.planStorageTime"/>
           </el-form-item>
           <el-form-item label="实际入库时间" style='flex:1' class='ml-20'>
             <el-input v-model="form.region"/>
@@ -96,12 +98,12 @@
           </el-form-item>
         </div>
         <div class='full-width  '>
-          <el-form-item label="项目建设详细地址" >
+          <el-form-item label="项目建设详细地址">
             <el-input v-model="form.name"/>
           </el-form-item>
         </div>
         <div class='full-width '>
-          <el-form-item label="主要建设内容及规模" >
+          <el-form-item label="主要建设内容及规模">
             <el-input v-model="form.name" type='textarea' :rows='4'/>
           </el-form-item>
         </div>
@@ -117,16 +119,24 @@ export default {
     info: {
       type: Object,
       default: null
+    },
+    detail: {
+      type: Object,
+      default: null
+    }
+  },
+  watch: {
+    detail: {
+      handler (val) {
+        this.form = val
+      },
+      immediate: true
     }
   },
   data () {
     return {
       disabled: true,
-      form: {
-        name: '',
-        region: '',
-        type: ''
-      }
+      form: {}
     }
   }
 }

src/views/home/pro_detail.vue

@@ -11,7 +11,7 @@
       <div v-if='currentTab.value === 1'>
         <basic-container v-for='(item,index) in resultList' :key='item.id'>
           <div class='full-width padding-top' :id="`header`+(index+1)">
-            <params1 v-if='item.dictKey === "1" ' :info='item'/>
+            <params1 v-if='item.dictKey === "1" ' :info='item' :detail='data'/>
             <params2 v-if='item.dictKey === "2" ' :info='item'/>
             <params3 v-if='item.dictKey === "3" ' :info='item'/>
             <params4 v-if='item.dictKey === "4" ' :info='item'/>