merge fix

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

@@ -102,7 +102,7 @@
           <el-form-item label="实际入库时间" style='flex:1' class='ml-20'>
             <el-date-picker
                 v-model="form.storage_time"
-                type="date"
+                type="month"
                 style="width:100%;"
                 placeholder="实际入库时间"
             />

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

@@ -2,7 +2,7 @@
   <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 v-if='detail.can_update'  type='primary' @click='disabled = !disabled'>
+      <el-button v-if='detail.can_update' type='primary' @click='disabled = !disabled'>
         {{ disabled ? '编 辑' : '保 存' }}
       </el-button>
     </div>
@@ -69,7 +69,7 @@
         <div class='full-width  flex'>
           <el-form-item label="是否获得资金支持项目" style='flex:1'>
             <div class='full-width'>
-              <el-select v-model='form.funds_supper' placeholder='是否获得资金支持项目' class='full-width'>
+              <el-select v-model='form.is_funded_project' placeholder='是否获得资金支持项目' class='full-width'>
                 <el-option
                     v-for="item in yesOrNo"
                     :key='item.label'
@@ -99,6 +99,14 @@ export default {
       default: null
     }
   },
+  watch: {
+    detail: {
+      handler (val) {
+        this.form = val
+      },
+      immediate: true
+    }
+  },
   data () {
     return {
       disabled: true,