|
|
@@ -30,7 +30,7 @@
|
|
|
<view class="bg-#fff pd-24" v-if="form?.harvestInfo">
|
|
|
<view class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<span class="c-#666">采收日期：</span>
|
|
|
- <span class="c-#333 f-w-600">{{ form?.harvestInfo?.harvestDate || '-' }}至{{ form?.harvestInfo?.harvestDateEnd || '-' }}</span>
|
|
|
+ <span class="c-#333 f-w-600">{{ getDateRangeFrt(form?.harvestInfo?.harvestDate, form?.harvestInfo?.harvestDateEnd) }}</span>
|
|
|
</view>
|
|
|
<view class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<span class="c-#666">采收批号：</span>
|
|
|
@@ -47,26 +47,26 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</template>
|
|
|
- <template v-if="form?.harvestId">
|
|
|
+ <template v-if="form?.processOutPutId">
|
|
|
<view class="pd-24">
|
|
|
<view class="startline-title">加工信息</view>
|
|
|
</view>
|
|
|
- <view class="bg-#fff pd-24" v-if="form?.harvestInfo">
|
|
|
+ <view class="bg-#fff pd-24" v-if="form?.processInfo">
|
|
|
<view class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
- <span class="c-#666">采收日期：</span>
|
|
|
- <span class="c-#333 f-w-600">{{ form?.harvestInfo?.harvestDate || '-' }}至{{ form?.harvestInfo?.harvestDateEnd || '-' }}</span>
|
|
|
+ <span class="c-#666">加工日期：</span>
|
|
|
+ <span class="c-#333 f-w-600">{{ getDateRangeFrt(form?.processInfo?.processingDate, form?.processInfo?.processingDateEnd) }}</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?.harvestCode || '-' }}
|
|
|
+ {{ (form?.processInfo?.capacity || '') + (form?.processInfo?.unit || '') || '-' }}
|
|
|
</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?.processInfo?.ptech ? form?.processInfo?.ptech.replace(/,/g, '→') : '-' }}
|
|
|
</span>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -160,18 +160,18 @@
|
|
|
<view class="c-#666 mb-10">检验报告：</view>
|
|
|
<ut-album :urls="form?.examinReport"></ut-album>
|
|
|
</view>
|
|
|
- <view v-if="['2', '3'].includes(form?.seedSource as string)" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
+ <view v-if="['2', '3'].includes(form?.seedSource as string) && form?.supplierId" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<view class="c-#666 mb-10">供应商：</view>
|
|
|
<view class="bg-#FBFDFB card-info-block pd-24 p-rtv">
|
|
|
<view class="f-s-34 c-#333 f-w-500">{{ form?.supplierInfo?.cusName }}</view>
|
|
|
<view class="f-s-24 c-#666">{{ form?.supplierInfo?.cusCode }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-if="['2', '3'].includes(form?.seedSource as string)" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
+ <view v-if="['2', '3'].includes(form?.seedSource as string) && form?.supplierProducerFlag" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<span class="c-#666">供应商是否是生产商：</span>
|
|
|
<span class="c-#333 f-w-600">{{ selectDictLabel(yes_no, form?.supplierProducerFlag) || '-' }}</span>
|
|
|
</view>
|
|
|
- <view v-if="['2', '3'].includes(form?.seedSource as string)" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
+ <view v-if="['2', '3'].includes(form?.seedSource as string) && form?.producer" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<span class="c-#666">生产商：</span>
|
|
|
<span class="c-#333 f-w-600">{{ form?.producer || '-' }}</span>
|
|
|
</view>
|
|
|
@@ -181,7 +181,7 @@
|
|
|
</view>
|
|
|
<view class="f-s-30 pd2-16-0 info-border-bottom" v-if="form?.instoreBizInfo?.idFlag">
|
|
|
<span class="c-#666">是否有个体标识：</span>
|
|
|
- <span class="c-#333 f-w-600">{{ selectDictLabel(yes_no, form?.instoreBizInfo?.idFlag) || '-' }}</span>
|
|
|
+ <span class="c-#333 f-w-600">{{ selectDictLabel(yes_no, form?.instoreBizInfo?.idFlag) || '否' }}</span>
|
|
|
</view>
|
|
|
<view v-if="form?.instoreBizInfo?.animals && form?.instoreBizInfo?.animals.length" class="f-s-30 pd2-16-0 info-border-bottom">
|
|
|
<view class="c-#666 mb-10">个体标识号：</view>
|
