duy пре 1 месец
родитељ
комит
ab30445f66
1 измењених фајлова са 36 додато и 33 уклоњено
  1. 36 33
      src/views/data-fill/collapse-form/push-code.vue

+ 36 - 33
src/views/data-fill/collapse-form/push-code.vue

@@ -7,18 +7,18 @@
             </el-radio-group>
         </div>
         <div v-if="formCode.type === 1" class="mt-2 bg-[#EFF5FF] py-[20px]">
-            <el-form ref="formCodeRef" :model="formCode" :inline="true" class="flex items-center justify-center" :rules="formCodeRules">
-                <div class="w-150px">
+            <el-form ref="formCodeRef" :model="formCode" :inline="true" class="flex flex-wrap items-center justify-start gap-x-4 gap-y-2 px-4" :rules="formCodeRules">
+                <div class="w-[160px]">
                     <el-form-item label=" " prop="startNumber1">
-                        <el-input v-model="formCode.startNumber1" placeholder="数值(起)" clearable />
+                        <el-input v-model="formCode.startNumber1" placeholder="数值(起)" clearable style="width: 120px;" />
                     </el-form-item>
                 </div>
-                <div class="w-150px">
+                <div class="w-[160px]">
                     <el-form-item label=" " prop="endNumber1">
-                        <el-input v-model="formCode.endNumber1" placeholder="数值(始)" clearable />
+                        <el-input v-model="formCode.endNumber1" placeholder="数值(始)" clearable style="width: 120px;" />
                     </el-form-item>
                 </div>
-                <div class="ml-1">
+                <div>
                     <el-form-item label=" " prop="increType1">
                         <el-select
                             v-model="formCode.increType1"
@@ -32,7 +32,7 @@
                         </el-select>
                     </el-form-item>
                 </div>
-                <div class="ml-1">
+                <div>
                     <el-form-item label=" " prop="cycleType1">
                         <el-select
                             v-model="formCode.cycleType1"
@@ -46,9 +46,9 @@
                     </el-form-item>
                 </div>
           
-                <div class="ml-1 w-150px">
+                <div>
                     <el-form-item label=" " prop="cycleTypeGroup1">
-                        <el-input v-model="formCode.cycleTypeGroup1" placeholder="循环组数" clearable />
+                        <el-input v-model="formCode.cycleTypeGroup1" placeholder="循环组数" clearable style="width: 120px;" />
                     </el-form-item>
                 </div>
             </el-form>
@@ -59,26 +59,27 @@
             </div>
         </div>
         <div v-if="formCode.type === 2" class="mt-2 flex justify-center bg-[#EFF5FF] py-[20px]">
-            <div>
+            <div class="max-w-5xl w-full">
                 <el-form ref="formCodeRef1" :model="formCode" :inline="true" :rules="formCodeRules">
-                    <div class="flex items-center">
-                        <div class="w-150px">
+                    <!-- First Row -->
+                    <div class="flex flex-wrap items-center gap-1">
+                        <div class="w-[160px]">
                             <el-form-item label=" " prop="startNumber1">
                                 <el-input v-model="formCode.startNumber1" placeholder="数值1(起)" clearable />
                             </el-form-item>
                         </div>
-                        <div class="w-150px">
+                        <div class="w-[160px]">
                             <el-form-item label=" " prop="endNumber1">
                                 <el-input v-model="formCode.endNumber1" placeholder="数值1(始)" clearable />
                             </el-form-item>
                         </div>
-                        <div class="ml-1">
+                        <div>
                             <el-form-item label=" " prop="increType1">
                                 <el-select
                                     v-model="formCode.increType1"
                                     placeholder="递增分类"
                                     clearable
-                                    style="width: 120px;"
+                                    style="width: 120px"
                                 >
                                     <el-option label="常规递增" :value="1" />
                                     <el-option label="奇数递增" :value="2" />
@@ -86,62 +87,65 @@
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div class="ml-1">
+                        <div>
                             <el-form-item label=" " prop="cycleType1">
                                 <el-select
                                     v-model="formCode.cycleType1"
                                     placeholder="循环分类"
                                     clearable
-                                    style="width: 120px;"
+                                    style="width: 120px"
                                 >
                                     <el-option label="固定循环" :value="1" />
                                     <el-option label="递增循环" :value="2" />
                                 </el-select>
                             </el-form-item>
                         </div>
-  
-                        <div class="ml-1 w-150px">
+                        <div class="w-[150px]">
                             <el-form-item label=" " prop="cycleTypeGroup1">
                                 <el-input v-model="formCode.cycleTypeGroup1" placeholder="循环组数" clearable />
                             </el-form-item>
                         </div>
                     </div>
-                    <div class="mt-4 flex items-start">
-                        <div class="mr-4 w-125px">
+
+                    <!-- Second Row (Info and Separator) -->
+                    <div class="mt-4 flex flex-wrap items-start gap-4">
+                        <div>
                             <el-form-item label=" " prop="separator">
                                 <el-select
                                     v-model="formCode.separator"
                                     placeholder="选择符号"
                                     clearable
-                                    style="width: 100px;"
+                                    style="width: 120px"
                                 >
                                     <el-option v-for="(item, index) in separatorOptions" :key="index" :label="item.label" :value="item.label" />
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div class="flex-1 text-orange-500">
+                        <div class="min-w-[300px] flex-1 text-orange-500">
                             <p class="mb-1">固定循环:起止以内的编号每个数据循环n次,如1-3:1、1、1...n个1/2、2、2..n个2/3、3、3...n个3</p>
                             <p>递增循环:起止以内的编号递增n次,如1-3:1、2、3/1、2、3/...n次循环1、2、3</p>
                         </div>
                     </div>
-                    <div class="mt-4 flex items-center">
-                        <div class="w-150px">
+
+                    <!-- Third Row -->
+                    <div class="mt-4 flex flex-wrap items-center gap-1">
+                        <div class="w-[160px]">
                             <el-form-item label=" " prop="startNumber2">
                                 <el-input v-model="formCode.startNumber2" placeholder="数值2(起)" clearable />
                             </el-form-item>
                         </div>
-                        <div class="w-150px">
+                        <div class="w-[160px]">
                             <el-form-item label=" " prop="endNumber2">
                                 <el-input v-model="formCode.endNumber2" placeholder="数值2(始)" clearable />
                             </el-form-item>
                         </div>
-                        <div class="ml-1">
+                        <div>
                             <el-form-item label=" " prop="increType2">
                                 <el-select
                                     v-model="formCode.increType2"
                                     placeholder="递增分类"
                                     clearable
-                                    style="width: 120px;"
+                                    style="width: 120px"
                                 >
                                     <el-option label="常规递增" value="1" />
                                     <el-option label="奇数递增" value="2" />
@@ -149,28 +153,27 @@
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div class="ml-1">
+                        <div>
                             <el-form-item label=" " prop="cycleType2">
                                 <el-select
                                     v-model="formCode.cycleType2"
                                     placeholder="循环分类"
                                     clearable
-                                    style="width: 120px;"
+                                    style="width: 120px"
                                 >
                                     <el-option label="固定循环" value="1" />
                                     <el-option label="递增循环" value="2" />
                                 </el-select>
                             </el-form-item>
                         </div>
-  
-                        <div class="ml-1 w-150px">
+                        <div class="w-[150px]">
                             <el-form-item label=" " prop="cycleTypeGroup2">
                                 <el-input v-model="formCode.cycleTypeGroup2" placeholder="循环组数" clearable />
                             </el-form-item>
                         </div>
                     </div>
                 </el-form>
-                <div class="text-orange-500 line-height-10">
+                <div class="mt-2 text-orange-500 line-height-10">
                     <p>提示:数值1和数值2分别代表组合编号的前后数据;起和止分别代表前后数据的开始编号和结束编号</p>
                 </div>
             </div>