huangxw 2 minggu lalu
induk
melakukan
1a10c7dd40

+ 10 - 4
src/plant/storage/fresh-goods/detail/index.vue

@@ -84,13 +84,19 @@
                             {{ form?.harvestInfo?.harvestCode || '-' }}
                         </span>
                     </view>
-                    <!-- 基地挖坑 -->
                     <view class="f-s-30 pd2-16-0 info-border-bottom">
-                        <span class="c-#666">种源加工处理工艺:</span>
+                        <span class="c-#666">采收负责人:</span>
                         <span class="c-#333 f-w-600">
-                            {{ form?.harvestInfo?.ptech ? form?.harvestInfo?.ptech.replace(/,/g, '→') : '-' }}
+                            {{ form?.harvestInfo?.mgrName || '-' }}
                         </span>
                     </view>
+                    <view class="f-s-30 pd2-16-0 info-border-bottom">
+                        <span class="c-#666">采收基地:</span>
+                        <span class="c-#333 f-w-600">
+                           <!-- 基地挖坑 -->
+                        </span>
+                    </view>
+
                 </view>
             </template>
             <view class="pd-24">
@@ -134,7 +140,7 @@
                     <span class="c-#333 f-w-600">{{ form?.producePlaceName || form?.producePlace || '-' }}</span>
                 </view>
 
-                <view v-if="form.instoreType == '2'" class="f-s-30 pd2-16-0 info-border-bottom">
+                <view v-if="form?.instoreType == '2'" class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">采收日期:</span>
                     <span class="c-#333 f-w-600">{{ form?.productDate || '-' }}~{{ form?.productDateEnd || '-' }}</span>
                 </view>

+ 13 - 28
src/plant/storage/medicine/list/index.vue

@@ -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?.instoreBizInfo.processType}`]: true }">{{ item?.seedLevel || '' }}{{ selectDictLabel(st_medicine_process_type, item?.instoreBizInfo?.processType) }}</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">
@@ -41,32 +41,17 @@
                                 <view v-else class="tag-span c-danger bg-#F9ECEA">未检验</view>
                             </view>
                         </view>
-                        <template v-if="item?.instoreType == '2'">
-                            <view class="pd2-4-0 f-s-28">
-                                <span class="c-#666">入库批号:</span>
-                                <span class="c-#333 f-w-500">{{ item?.batchCode || '-' }}</span>
-                            </view>
-                            <view v-if="item?.supplierId" class="pd2-4-0 f-s-28">
-                                <span class="c-#666">供应商:</span>
-                                <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
-                            </view>
-                        </template>
-                        <template v-if="item?.instoreType == '3'">
-                            <view class="pd2-4-0 f-s-28">
-                                <span class="c-#666">采收批号:</span>
-                                <span class="c-#333 f-w-500">{{ item?.harvestInfo?.harvestCode || '-' }}</span>
-                            </view>
-                            <view class="pd2-4-0 f-s-28">
-                                <span class="c-#666">采收基地:</span>
-                                <span class="c-#333 f-w-500">
-                                    {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
-                                </span>
-                            </view>
-                        </template>
-
-                        <view v-if="item?.warehouses?.length" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">存放库房:</span>
-                            <span class="c-#333 f-w-500">{{ getStorageRoomNames(item?.warehouses) || '-' }}</span>
+                        <view class="pd2-4-0 f-s-28">
+                            <span class="c-#666">生产批号:</span>
+                            <span class="c-#333 f-w-500">{{ item?.batchCode || '-' }}</span>
+                        </view>
+                        <view class="pd2-4-0 f-s-28">
+                            <span class="c-#666">执行标准:</span>
+                            <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
+                        </view>
+                        <view class="pd2-4-0 f-s-28">
+                            <span class="c-#666">加工工艺:</span>
+                            <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
                         </view>
                         <view class="pd2-4-0 f-s-28">
                             <span class="c-#666">入库量:</span>
@@ -100,7 +85,7 @@ import { selectDictListClass } from '@/utils/ruoyi';
 import { getStorageRoomNames } from '@/utils/common';
 import FreshGoodsBottom from './model/fresh-goods-bottom.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { st_medicine_process_type  } = toRefs<any>(proxy?.useDict('st_medicine_process_type'));
+const { st_medicine_process_type } = toRefs<any>(proxy?.useDict('st_medicine_process_type'));
 const list = ref<any[]>();
 const form = ref({ keyword: '', restFlag: '1', processType: '', storageType: '5' });
 const paging = ref();