lxf преди 5 часа
родител
ревизия
c4311fc18c
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 2 2
      src/views/old_mini/growth_report/index.vue
  2. 3 3
      src/views/old_mini/interaction/index.vue

+ 2 - 2
src/views/old_mini/growth_report/index.vue

@@ -61,7 +61,7 @@
                                         v-for="(card, cardI) in pendingFarmWork"
                                         :key="cardI"
                                         class="status-card pending-card"
-                                        :style="{ background: card.purposeColor }"
+                                        :style="{ background: card.purposeColor, color: card.purposeColor === '#FFFFFF' ? '#000' : '#fff' }"
                                         :class="card.type"
                                         @click="handlePendingFarmWorkClick(card)"
                                         >
@@ -72,7 +72,7 @@
                                         <div class="status-title">
                                             {{ card.name }}
                                         </div>
-                                        <div class="status-sub pending-sub">
+                                        <div class="status-sub pending-sub" :style="{ color: card.purposeColor === '#FFFFFF' ? '#000' : '#fff' }">
                                             {{ card.purposeName }}
                                         </div>
                                     </div>

+ 3 - 3
src/views/old_mini/interaction/index.vue

@@ -18,15 +18,15 @@
                 <div v-for="(region, regionIndex) in crop.regions" :key="regionIndex" class="variety-card">
                     <div class="field-row">
                         <div class="field-value variety-select-wrap" v-if="farmData.status === 'INIT' || isAddVariety">
-                            <el-select v-model="region.regionId" class="variety-input" placeholder="选择品种">
+                            <el-select filterable v-model="region.regionId" class="variety-input" placeholder="选择品种">
                                 <el-option v-for="(item, index) in crop.typeIdItems" :key="index" :label="item.name"
                                     :value="item.id"
                                     :disabled="isVarietyOptionDisabled(crop, region, item.id) || item.selected === 1" />
-                                <template #footer>
+                                <!-- <template #footer>
                                     <el-button text bg @click="onAddOption(region)">
                                         + 增加品种
                                     </el-button>
-                                </template>
+                                </template> -->
                             </el-select>
                             <div
                                 v-if="regionIndex > 0"