修改

src/components/ut-datetime-picker/ut-datetime-picker.vue

@@ -39,7 +39,7 @@ const props = withDefaults(defineProps<Props>(), {
     mode: 'datetime' as DateTimeMode,
     border: false,
     hasInput: false,
-    minDate: new Date(2000, 0, 1).getTime(),
+    minDate: new Date(1990, 0, 1).getTime(),
     maxDate: new Date(2050, 0, 1).getTime(),
     dateFields: 'day',
     // 留空以便按粒度自动输出：year→{y}，month→{y}-{m}，day→{y}-{m}-{d}

src/plant/storage/agro-product/list/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" hide-no-more-inside>
         <template #top>
-            <ut-navbar title="农资库" :fixed="false"></ut-navbar>
+            <ut-navbar title="农资库" :fixed="false" :breadcrumb="false"></ut-navbar>
         </template>
 
         <view class="pd3-24-24-0">

src/plant/storage/fresh-goods/info-edit/index.vue

@@ -112,14 +112,33 @@
                     </up-form-item>
                 </PickerAreaInput>
                 <view class="h-1" id="productDatepppp"></view>
-                <ut-datetime-picker v-model="form.productDate" :maxDate="new Date()" mode="date">
-                    <up-form-item borderBottom label="采收日期" prop="productDate" required>
-                        <up-input v-model="form.productDate" readonly placeholder="请选择采收日期" border="none" clearable></up-input>
-                        <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                        </template>
-                    </up-form-item>
-                </ut-datetime-picker>
+                <view class="h-1" id="productDateEndpppp"></view>
+                <up-form-item prop="productDate" required label="采收日期" class="form-item-bottom-padding-0">
+                    <view class="flex1 d-flex">
+                        <view class="flex1">
+                            <ut-datetime-picker v-model="form.productDate" :maxDate="form.productDateEnd || new Date()" mode="date">
+                                <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
+                                    <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-datetime-picker>
+                        </view>
+                        <view class="pd2-0-20"></view>
+                        <view class="flex1">
+                            <ut-datetime-picker v-model="form.productDateEnd" :minDate="form.productDate" :maxDate="new Date()" mode="date">
+                                <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
+                                    <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-datetime-picker>
+                        </view>
+                    </view>
+                </up-form-item>
+
                 <!-- 媒体与附件 -->
                 <up-form-item borderBottom label="鲜货图片" prop="imgs">
                     <ut-upload v-model="form.imgs" :max-count="9" valueType="string"></ut-upload>
@@ -165,6 +184,7 @@ const createDefaultForm = (): FreshGoodsInstoreItemForm => ({
     productDate: '',
     imgs: '',
     vedios: '',
+    productDateEnd: '',
 });
 
 const form = ref<FreshGoodsInstoreItemForm>(createDefaultForm());
@@ -198,7 +218,8 @@ const rules = reactive({
         },
     ],
     producePlace: [{ required: true, message: '请选择鲜货产地' }],
-    productDate: [{ required: true, message: '请选择采收日期' }],
+    productDate: [{ required: true, message: '请选择开始日期' }],
+    productDateEnd: [{ required: true, message: '请选择结束日期' }],
 });
 
 const submitForm = async () => {

src/plant/storage/fresh-goods/info-update/index.vue

@@ -98,14 +98,32 @@
                         </up-form-item>
                     </PickerAreaInput>
                     <view class="h-1" id="productDatepppp"></view>
-                    <ut-datetime-picker v-model="form.productDate" :maxDate="new Date()" mode="date">
-                        <up-form-item borderBottom label="采收日期" prop="productDate" required>
-                            <up-input v-model="form.productDate" readonly placeholder="请选择采收日期" border="none" clearable></up-input>
-                            <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                            </template>
-                        </up-form-item>
-                    </ut-datetime-picker>
+                    <view class="h-1" id="productDateEndpppp"></view>
+                    <up-form-item prop="productDate" required label="采收日期" class="form-item-bottom-padding-0">
+                        <view class="flex1 d-flex">
+                            <view class="flex1">
+                                <ut-datetime-picker v-model="form.productDate" :maxDate="form.productDateEnd || new Date()" mode="date">
+                                    <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
+                                        <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
+                                        <template #right>
+                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        </template>
+                                    </up-form-item>
+                                </ut-datetime-picker>
+                            </view>
+                            <view class="pd2-0-20"></view>
+                            <view class="flex1">
+                                <ut-datetime-picker v-model="form.productDateEnd" :minDate="form.productDate" :maxDate="new Date()" mode="date">
+                                    <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
+                                        <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
+                                        <template #right>
+                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        </template>
+                                    </up-form-item>
+                                </ut-datetime-picker>
+                            </view>
+                        </view>
+                    </up-form-item>
                     <!-- 媒体与附件 -->
                     <up-form-item borderBottom label="鲜货图片" prop="imgs">
                         <ut-upload v-model="form.imgs" :max-count="9" valueType="string"></ut-upload>
@@ -221,8 +239,31 @@
                         </up-form-item>
                     </PickerAreaInput>
                     <view class="h-1" id="productDatepppp"></view>
-                    <up-form-item borderBottom label="采收日期" required>
-                        <up-input v-model="form.productDate" readonly placeholder="请选择采收日期" border="none" clearable></up-input>
+                    <view class="h-1" id="productDateEndpppp"></view>
+                    <up-form-item prop="productDate" required label="采收日期" class="form-item-bottom-padding-0">
+                        <view class="flex1 d-flex">
+                            <view class="flex1">
+                                <ut-datetime-picker v-model="form.productDate" :maxDate="form.productDateEnd || new Date()" mode="date">
+                                    <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
+                                        <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
+                                        <template #right>
+                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        </template>
+                                    </up-form-item>
+                                </ut-datetime-picker>
+                            </view>
+                            <view class="pd2-0-20"></view>
+                            <view class="flex1">
+                                <ut-datetime-picker v-model="form.productDateEnd" :minDate="form.productDate" :maxDate="new Date()" mode="date">
+                                    <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
+                                        <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
+                                        <template #right>
+                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        </template>
+                                    </up-form-item>
+                                </ut-datetime-picker>
+                            </view>
+                        </view>
                     </up-form-item>
                     <!-- 媒体与附件 -->
                     <up-form-item borderBottom label="鲜货图片" prop="imgs">
@@ -322,7 +363,8 @@ const rules = reactive({
         },
     ],
     producePlace: [{ required: true, message: '请选择鲜货产地' }],
-    productDate: [{ required: true, message: '请选择采收日期' }],
+    productDate: [{ required: true, message: '请选择开始日期' }],
+    productDateEnd: [{ required: true, message: '请选择结束日期' }],
     'instoreBizInfo.instoreMg': [{ required: true, message: '请输入入库人' }],
 });
 

src/plant/storage/fresh-goods/list/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" hide-no-more-inside>
         <template #top>
-            <ut-navbar title="鲜货库" :fixed="false"></ut-navbar>
+            <ut-navbar title="鲜货库" :fixed="false" :breadcrumb="false"></ut-navbar>
         </template>
 
         <view class="pd3-24-24-0">
@@ -10,7 +10,7 @@
             </view>
             <view class="d-flex a-c">
                 <view class="min-w-230 flex1">
-                    <ut-action-sheet v-model="form.instoreType" :tabs="[{ label: '全部', value: '' }, ...pt_fresh_instore_type]" mode="custom" @change="onRefresh" title="选择入库类型">
+                    <ut-action-sheet v-model="form.instoreType" :tabs="tabs_pt_fresh_instore_type" mode="custom" @change="onRefresh" title="选择入库类型">
                         <view class="d-flex search-select-item a-c">
                             <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(pt_fresh_instore_type, form.instoreType) || '全部' }} </view>
                             <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
@@ -111,7 +111,9 @@ const tabs = ref([
     { label: '有库存', value: '1' },
     { label: '无库存', value: '0' },
 ]);
-
+const tabs_pt_fresh_instore_type = computed(() => {
+    return [{ label: '全部', value: '' }, ...pt_fresh_instore_type.value].filter((item: any) => item.value != '4');
+});
 const changeSeach = () => {
     paging.value.reload();
 };

src/plant/storage/medicine/list/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
         <template #top>
-            <ut-navbar title="鲜货库" :fixed="false"></ut-navbar>
+            <ut-navbar title="药材库" :fixed="false" :breadcrumb="false"></ut-navbar>
         </template>
 
         <view class="pd3-24-24-0">
@@ -102,7 +102,7 @@ import FreshGoodsBottom from './model/fresh-goods-bottom.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { pt_fresh_instore_type } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type'));
 const list = ref<any[]>();
-const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '4' });
+const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '5' });
 const paging = ref();
 const tabs = ref([
     { label: '有库存', value: '1' },

src/plant/storage/seed-source/list/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
         <template #top>
-            <ut-navbar title="种源库" :fixed="false"></ut-navbar>
+            <ut-navbar title="种源库" :fixed="false" :breadcrumb="false"></ut-navbar>
         </template>
 
         <view class="pd3-24-24-0">