Merge remote-tracking branch 'origin/master'

src/views/project/admin/create.vue

@@ -99,14 +99,14 @@
         </el-form>
         <hc-card-item class="year-detail mt-3">
             <template #header>
-                <el-select v-model="selectYear" placeholder="选择年份" class="select-year w-[100px]">
-                    <el-option v-for="item in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-select v-model="selectYear" placeholder="选择年份" class="select-year w-[100px]" @change="changeYear">
+                    <el-option v-for="(item, index) in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </template>
-            <el-form :model="yearForm" label-width="auto" :rules="yearFormRules" class="mt-3" label-position="left" size="large">
+            <el-form :model="yearOptions[selectIndex]?.yearForm" label-width="auto" :rules="yearFormRules" class="mt-3" label-position="left" size="large">
                 <el-form-item label="全年计划投资:" prop="key1" class="w-100">
                     <el-input
-                        v-model="yearForm.key1" placeholder="请输入" clearable
+                        v-model="yearOptions[selectIndex].yearForm.key1" placeholder="请输入" clearable
                         :formatter="formatInput"
                     >
                         <template #append>亿元</template>
@@ -115,25 +115,25 @@
                 <el-form-item label="预计完成投资额:" prop="key1">
                     <div class="quarter-box w-full flex">
                         <div class="flex">
-                            <el-input v-model="yearForm.key2" placeholder="请输入" clearable :formatter="formatInput">
+                            <el-input v-model="yearOptions[selectIndex].yearForm.key2" placeholder="请输入" clearable :formatter="formatInput">
                                 <template #prepend>一季度</template>
                                 <template #append>亿元</template>
                             </el-input>
                         </div>
                         <div class="ml-[40px] flex">
-                            <el-input v-model="yearForm.key3" placeholder="请输入" clearable :formatter="formatInput">
+                            <el-input v-model="yearOptions[selectIndex].yearForm.key3" placeholder="请输入" clearable :formatter="formatInput">
                                 <template #prepend>二季度</template>
                                 <template #append>亿元</template>
                             </el-input>
                         </div>
                         <div class="ml-[40px] flex">
-                            <el-input v-model="yearForm.key4" placeholder="请输入" clearable :formatter="formatInput">
+                            <el-input v-model="yearOptions[selectIndex].yearForm.key4" placeholder="请输入" clearable :formatter="formatInput">
                                 <template #prepend>三季度</template>
                                 <template #append>亿元</template>
                             </el-input>
                         </div>
                         <div class="ml-[40px] flex">
-                            <el-input v-model="yearForm.key5" placeholder="请输入" clearable :formatter="formatInput">
+                            <el-input v-model="yearOptions[selectIndex].yearForm.key5" placeholder="请输入" clearable :formatter="formatInput">
                                 <template #prepend>四季度</template>
                                 <template #append>亿元</template>
                             </el-input>
@@ -141,22 +141,22 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="全年目标:" prop="key6">
-                    <el-input v-model="yearForm.key6" placeholder="请输入" clearable type="textarea" />
+                    <el-input v-model="yearOptions[selectIndex].yearForm.key6" placeholder="请输入" clearable type="textarea" />
                 </el-form-item>
             </el-form>
-            <el-form :model="yearForm" label-width="auto" :rules="yearFormRules" class="mt-3" label-position="left">
+            <el-form :model="yearOptions[selectIndex].yearForm" label-width="auto" :rules="yearFormRules" class="mt-3" label-position="left">
                 <div class="hc-form-item-title">各季度工作计划:</div>
                 <el-form-item label="一季度:" prop="key7">
-                    <el-input v-model="yearForm.key7" placeholder="请输入" clearable type="textarea" />
+                    <el-input v-model="yearOptions[selectIndex].yearForm.key7" placeholder="请输入" clearable type="textarea" />
                 </el-form-item>
                 <el-form-item label="二季度:" prop="key8">
-                    <el-input v-model="yearForm.key8" placeholder="请输入" clearable type="textarea" />
+                    <el-input v-model="yearOptions[selectIndex].yearForm.key8" placeholder="请输入" clearable type="textarea" />
                 </el-form-item>
                 <el-form-item label="三季度:" prop="key8">
-                    <el-input v-model="yearForm.key8" placeholder="请输入" clearable type="textarea" />
+                    <el-input v-model="yearOptions[selectIndex].yearForm.key8" placeholder="请输入" clearable type="textarea" />
                 </el-form-item>
                 <el-form-item label="四季度:" prop="key10">
-                    <el-input v-model="yearForm.key10" placeholder="请输入" clearable type="textarea" />
+                    <el-input v-model="yearOptions[selectIndex].yearForm.key10" placeholder="请输入" clearable type="textarea" />
                 </el-form-item>
             </el-form>
         </hc-card-item>
@@ -172,7 +172,7 @@
 import { computed, onMounted, ref, watch } from 'vue'
 import { isNullES } from 'js-fast-way'
 import { getDictionary } from '~api/dictbiz'
-   import { arrToKey, formValidate, getArrValue, getObjValue, isArrItem } from 'js-fast-way'
+   import { arrIndex, formValidate, getArrValue, getObjValue, isArrItem } from 'js-fast-way'
 
 const props = defineProps({
     form: {
@@ -279,15 +279,20 @@ const endYearBlur = () => {
         {
             value:year,
             label:year,
+            yearForm:{},
         },
     )
   }
   yearOptions.value = years
 }
 //选择年份
-const yearOptions = ref([])
+const selectIndex = ref(0)
+const yearOptions = ref([{ yearForm:{} }])
 const selectYear = ref('')
-
+const changeYear = (val)=>{
+    selectIndex.value = arrIndex(yearOptions.value, 'value', val)
+    console.log( selectIndex.value, '111111')
+}
 const yearForm = ref({ key1:'', key2: '', key3:'', key4:'', key5:'', key6:'', key7:'', key8:'', key9:'', key10:'' })
 const yearFormRules = {}
 const formatInput = (value)=>{
@@ -336,6 +341,7 @@ const saveClick = () => {
     const form = formInfo.value
     if (isNullES(form.id)) cancelClick()
     console.log('保存')
+console.log(yearOptions.value, '111111')
 }
 </script>