修改

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

@@ -18,12 +18,12 @@
             </view>
             <view class="bg-#fff pd-24">
                 <view class="d-flex j-sb a-c li-item-head mb-16">
-                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ form?.seedLevel || '' }}{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
+                    <view class="li-left-tag" :class="{ [`bg-instore-${form?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, form?.instoreType) }}</view>
                     <view class="f-s-22 c-#666">{{ form?.instoreBizInfo?.instoreDate }}</view>
                 </view>
                 <view class="mb-10">
                     <span class="f-s-34 c-#333 f-w-500 mr-10">{{ form?.variety }}</span>
-                    <span v-if="form?.partName" class="f-s-24 c-#666">{{ form?.partName }}</span>
+                    <span v-if="form?.partName" class="f-s-24 c-#666">{{ form?.level || '' }}{{ form?.partName }}</span>
                 </view>
                 <template v-if="form?.instoreType == '2'">
                     <view class="pd2-4-0 f-s-28">

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

@@ -28,13 +28,13 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe($event, item)" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.level || '' }}{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="d-flex flex1 mb-10">
                             <view class="flex1">
                                 <span class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.variety }}</span>
-                                <span v-if="item?.partName" class="f-s-24 c-#666">{{ item?.partName }}</span>
+                                <span v-if="item?.partName" class="f-s-24 c-#666">{{ item?.level || '' }}{{ item?.partName }}</span>
                             </view>
                             <view>
                                 <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>

src/plant/storage/loss-register/index.vue

@@ -45,12 +45,12 @@
                     </template>
                     <template v-if="info?.stockType === '2'">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.seedLevel }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ info?.updateTime || info?.createTime }}</view>
                         </view>
                         <view class="mb-10">
                             <span class="f-s-34 c-#333 f-w-500 mr-10">{{ info?.variety }}</span>
-                            <span class="f-s-24 c-#666">{{ selectDictLabel(pt_seed_type, info?.seedType) }}</span>
+                            <span class="f-s-24 c-#666">{{ info?.seedLevel }}{{ selectDictLabel(pt_seed_type, info?.seedType) }}</span>
                         </view>
                         <view class="pd2-4-0 f-s-28">
                             <span class="c-#666">入库批号：</span>
@@ -81,12 +81,12 @@
                     </template>
                     <template v-if="info?.stockType === '4'">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.level }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ info?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="mb-10">
                             <span class="f-s-34 c-#333 f-w-500 mr-10">{{ info?.variety }}</span>
-                            <span v-if="info?.partName" class="f-s-24 c-#666">{{ info?.partName }}</span>
+                            <span v-if="info?.partName" class="f-s-24 c-#666">{{ info?.level }}{{ info?.partName }}</span>
                         </view>
                         <view class="pd2-4-0 f-s-28">
                             <span class="c-#666">入库批号：</span>

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

@@ -10,9 +10,9 @@
             </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.processType" :tabs="[{ label: '全部', value: '' }, ...st_medicine_process_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>
+                            <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(st_medicine_process_type, form.processType) || '全部' }} </view>
                             <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
                         </view>
                     </ut-action-sheet>
@@ -28,7 +28,7 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel || '' }}{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreBizInfo.processType}`]: true }">{{ item?.seedLevel || '' }}{{ selectDictLabel(st_medicine_process_type, item?.instoreBizInfo?.processType) }}</view>
                             <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="d-flex flex1 mb-10">
@@ -100,9 +100,9 @@ import { selectDictListClass } from '@/utils/ruoyi';
 import { getStorageRoomNames } from '@/utils/common';
 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 { st_medicine_process_type  } = toRefs<any>(proxy?.useDict('st_medicine_process_type'));
 const list = ref<any[]>();
-const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '5' });
+const form = ref({ keyword: '', restFlag: '1', processType: '', storageType: '5' });
 const paging = ref();
 const tabs = ref([
     { label: '有库存', value: '1' },

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

@@ -28,13 +28,13 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe($event, item)" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/seed-source/detail/index', params: { id: item.id } })">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel }}{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ selectDictLabel(pt_seed_instore_type, item?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="d-flex flex1 mb-10">
                             <view class="flex1">
                                 <span class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.variety }}</span>
-                                <span class="f-s-24 c-#666">{{ selectDictLabel(pt_seed_type, item?.seedType) }}</span>
+                                <span class="f-s-24 c-#666">{{ item?.seedLevel }}{{ selectDictLabel(pt_seed_type, item?.seedType) }}</span>
                             </view>
                             <view>
                                 <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>