Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master'

ZaiZai 1 anno fa
parent
commit
43e5c75539
1 ha cambiato i file con 60 aggiunte e 49 eliminazioni
  1. 60 49
      src/views/system/set.vue

+ 60 - 49
src/views/system/set.vue

@@ -479,24 +479,25 @@
                                         重点项目推进计划
                                     </div>
                                     <div class="main-project">
-                                        <div class="main-project-item">
-                                            <div>
-                                                <span>项目阶段</span>
-                                                <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
-                                            </div>
-                                            <div style="max-height:300px;overflow-y: auto;">
-                                                <div v-for="(item, index) in proStation" :key="index" class="mt-1">
-                                                    <el-input v-model="item.dictValue" style="width: 340px" placeholder="阶段名称" /> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClick(item, index)" />
-                                                    </el-link> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClick(item, index)" />
-                                                    </el-link>
+                                        <div>
+                                            <div class="main-project-item">
+                                                <div>
+                                                    <span>项目阶段</span>
+                                                    <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
+                                                </div>
+                                                <div style="max-height:300px;overflow-y: auto;">
+                                                    <div v-for="(item, index) in proStation" :key="index" class="mt-1">
+                                                        <el-input v-model="item.dictValue" style="width: 340px" placeholder="阶段名称" /> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClick(item, index)" />
+                                                        </el-link> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClick(item, index)" />
+                                                        </el-link>
+                                                    </div>
                                                 </div>
                                             </div>
-
-                                            <div> 
+                                            <div class="ml-38 mt-3"> 
                                                 <el-button color="#20C98B" type="primary" class="ml-8" :loading="saveProStationLoad" @click="saveProStation">
                                                     <hc-icon name="save" class="text-white" />
                                                     <span class="text-white">保存</span>
@@ -504,23 +505,25 @@
                                             </div>
                                         </div>
 
-                                        <div class="main-project-item">
-                                            <div>
-                                                <span>项目类型</span>
-                                                <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
-                                            </div>
-                                            <div style="max-height:300px;overflow-y: auto;">
-                                                <div v-for="(item, index) in proType" :key="index" class="mt-1">
-                                                    <el-input v-model="item.dictValue" style="width: 340px" placeholder="类型名称" /> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClickType(item, index)" />
-                                                    </el-link> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClickType(item, index)" />
-                                                    </el-link>
+                                        <div>
+                                            <div class="main-project-item">
+                                                <div>
+                                                    <span>项目类型</span>
+                                                    <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
+                                                </div>
+                                                <div style="max-height:300px;overflow-y: auto;">
+                                                    <div v-for="(item, index) in proType" :key="index" class="mt-1">
+                                                        <el-input v-model="item.dictValue" style="width: 340px" placeholder="类型名称" /> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClickType(item, index)" />
+                                                        </el-link> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClickType(item, index)" />
+                                                        </el-link>
+                                                    </div>
                                                 </div>
                                             </div>
-                                            <div> 
+                                            <div class="ml-38 mt-3"> 
                                                 <el-button color="#20C98B" type="primary" class="ml-8" :loading="saveProTypenLoad" @click="saveProType">
                                                     <hc-icon name="save" class="text-white" />
                                                     <span class="text-white">保存</span>
@@ -533,23 +536,31 @@
                                         工作要点任务分工
                                     </div>
                                     <div class="main-project">
-                                        <div class="main-project-item">
-                                            <div>
-                                                <span>项目阶段</span>
-                                                <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
-                                            </div>
-                                            <div style="max-height:300px;overflow-y: auto;">
-                                                <div v-for="(item, index) in proStationTip" :key="index" class="mt-1">
-                                                    <el-input v-model="item.dictValue" style="width: 340px" placeholder="阶段名称" /> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClickTip(item, index)" />
-                                                    </el-link> 
-                                                    <el-link :underline="false" type="primary">
-                                                        <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClickTip(item, index)" />
-                                                    </el-link>
+                                        <div>
+                                            <div class="main-project-item">
+                                                <div>
+                                                    <span>项目阶段</span>
+                                                    <hc-icon name="arrow-right-s" style="font-size: 16px;" class="ml-2 mr-2 font-bold" />
                                                 </div>
+                                                <div style="max-height:300px;overflow-y: auto;">
+                                                    <div v-for="(item, index) in proStationTip" :key="index" class="mt-1">
+                                                        <el-input v-model="item.dictValue" style="width: 340px" placeholder="阶段名称" /> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="add" style="font-size: 20px;" class="font-bold" @click="addClickTip(item, index)" />
+                                                        </el-link> 
+                                                        <el-link :underline="false" type="primary">
+                                                            <hc-icon name="close" style="font-size: 20px;" class="font-bold" @click="delClickTip(item, index)" />
+                                                        </el-link>
+                                                    </div>
+                                                </div>
+                                                <!-- <div> 
+                                                <el-button color="#20C98B" type="primary" class="ml-8" :loading="savProStationTipLoad" @click="saveProStationTip"> 
+                                                    <hc-icon name="save" class="text-white" />
+                                                    <span class="text-white">保存</span>
+                                                </el-button>
+                                            </div> -->
                                             </div>
-                                            <div> 
+                                            <div class="ml-38 mt-3"> 
                                                 <el-button color="#20C98B" type="primary" class="ml-8" :loading="savProStationTipLoad" @click="saveProStationTip"> 
                                                     <hc-icon name="save" class="text-white" />
                                                     <span class="text-white">保存</span>
@@ -622,7 +633,7 @@
     }
    const addClick = (item, index)=>{
   
-    proStation.value.splice(index, 0, { dictValue:'' })
+    proStation.value.splice(index + 1, 0, { dictValue:'' })
    }
    const delClick = (item, index)=>{
     if ( proStation.value.length === 1) {
@@ -670,7 +681,7 @@
     }
    const addClickType = (item, index)=>{
   
-    proType.value.splice(index, 0, { dictValue:'' })
+    proType.value.splice(index + 1, 0, { dictValue:'' })
  }
  const delClickType = (item, index)=>{
     if ( proType.value.length === 1) {
@@ -714,7 +725,7 @@ const { error, code, data } = await getDictionary({ code:'workFocusStage' })
 }
    const addClickTip = (item, index)=>{
   
-    proStationTip.value.splice(index, 0, { dictValue:'' })
+    proStationTip.value.splice(index + 1, 0, { dictValue:'' })
    }
    const delClickTip = (item, index)=>{
     if ( proStationTip.value.length === 1) {