zhengnaiwen_citu il y a 3 mois
Parent
commit
43bbe998c0

+ 8 - 7
src/views/salary/solution/salaryCoefficient/salarySolutionParam.vue

@@ -17,18 +17,19 @@
               >
                 <el-form-item
                   label-width="150px"
-                  v-for="(calculateConfiguration, index) in item.calculateConfigurations"
+                  v-for="(calculate, index) in item.calculateConfigurations"
                   :key="index"
-                  :label="calculateConfiguration.name"
+                  :label="calculate.name"
                   class="mt-3"
                 >
-                  <template v-if="calculateConfiguration.valueCategory === 0">
+                  <template v-if="calculate.valueCategory === 0">
                     <el-slider
                       input-size="small"
-                      v-model="calculateConfiguration.value"
-                      :min="calculateConfiguration.miniValue"
-                      :max="calculateConfiguration.maxValue"
+                      v-model="calculate.value"
+                      :min="((calculate.miniValue === -Infinity || calculate.miniValue === null) ? -999 : calculate.miniValue) ?? -999"
+                      :max="((calculate.maxValue === Infinity || calculate.maxValue === null) ? 999 : calculate.maxValue) ?? 999"
                       :step="0.01"
+                      :disabled="(calculate.miniValue === calculate.maxValue) && calculate.miniValue !== null"
                       show-input
                     >
                     </el-slider>
@@ -41,7 +42,7 @@
                         { label: '名称', prop: 'name' },
                         { label: '值', prop: 'value' }
                       ]"
-                      :items="calculateConfiguration.value"
+                      :items="calculate.value"
                     >
                       <template #value="{ row }">
                         <el-input v-model="row.value" size="small" placeholder="请输入对应的值"></el-input>

+ 8 - 7
src/views/sandbox/sandboxParam.vue

@@ -17,18 +17,19 @@
               >
                 <el-form-item
                   label-width="150px"
-                  v-for="(calculateConfiguration, index) in item.calculateConfigurations"
+                  v-for="(calculate, index) in item.calculateConfigurations"
                   :key="index"
-                  :label="calculateConfiguration.name"
+                  :label="calculate.name"
                   class="mt-3"
                 >
-                  <template v-if="calculateConfiguration.valueCategory === 0">
+                  <template v-if="calculate.valueCategory === 0">
                     <el-slider
                       input-size="small"
-                      v-model="calculateConfiguration.value"
-                      :min="calculateConfiguration.miniValue"
-                      :max="calculateConfiguration.maxValue"
+                      v-model="calculate.value"
+                      :min="((calculate.miniValue === -Infinity || calculate.miniValue === null) ? -999 : calculate.miniValue) ?? -999"
+                      :max="((calculate.maxValue === Infinity || calculate.maxValue === null) ? 999 : calculate.maxValue) ?? 999"
                       :step="0.01"
+                      :disabled="(calculate.miniValue === calculate.maxValue) && calculate.miniValue !== null"
                       show-input
                     >
                     </el-slider>
@@ -41,7 +42,7 @@
                         { label: '名称', prop: 'name' },
                         { label: '值', prop: 'value' }
                       ]"
-                      :items="calculateConfiguration.value"
+                      :items="calculate.value"
                     >
                       <template #value="{ row }">
                         <el-input v-model="row.value" size="small" placeholder="请输入对应的值"></el-input>