完成

src/plant/models/warehouseCard/product-item.vue

@@ -13,11 +13,10 @@
                     {{ item?.instoreBizInfo?.proLevel }}
                 </span>
             </view>
-            <view v-if="!props.hideExtraInfo">
-                <!-- 成品已检/未检状态标签 -->
+            <!-- <view v-if="!props.hideExtraInfo">
                 <view v-if="item?.isInspected" class="tag-span c-primary bg-#EBF6EE">成品已检</view>
                 <view v-else class="tag-span c-danger bg-#F9ECEA">成品未检</view>
-            </view>
+            </view> -->
         </view>
         <view class="" v-if="+item.instoreBizInfo?.productType == 6">
             <span v-if="item?.instoreBizInfo?.finalSpecn" class="f-s-24 c-#666"> {{ item?.instoreBizInfo?.finalSpecn }}{{ item?.instoreBizInfo?.finalUnit }} </span>

src/plant/port/port-detail/index.vue

@@ -166,7 +166,7 @@
                         <text class="c-#666 f-s-30">是否代繁育：</text>
                         <text class="c-#333 f-s-30 f-w-5">{{ form.delegateFlag ? selectDictLabel(yes_no, form.delegateFlag) : '--' }}</text>
                     </view>
-                    <view delegateFlag class="pt-16 pb-16 info-border-bottom">
+                    <view v-if="+form.delegateFlag" class="pt-16 pb-16 info-border-bottom">
                         <view class="c-#666 f-s-30 mb-20">委托企业：</view>
                         <view class="pd-24 d-flex flex-cln bg-#FBFDFB border-#37A954 b-radius mb-20">
                             <view class="">

src/plant/processing/processing-detail-list/index.vue

@@ -161,7 +161,7 @@
     </z-paging>
 
     <!-- 添加/修改产出信息弹框 -->
-    <OutputInfo v-if="showOutputModel" v-model:show="showOutputModel" :type="taskDetail?.processType" :processId="taskId" :isEdit="isEditOutput" :editData="editOutputData" @confirm="handleOutputConfirm" />
+    <OutputInfo v-if="showOutputModel" v-model:show="showOutputModel" :type="taskDetail?.processType" :processId="taskId" :isEdit="isEditOutput" :editData="editOutputData" :processMedType="taskDetail?.processMedType" @confirm="handleOutputConfirm" />
 </template>
 
 <script setup lang="ts">

src/plant/processing/processing-detail-list/models/outputInfo.vue

@@ -40,12 +40,12 @@
                                 </view>
                             </up-form-item>
                             <!-- 产出物图片 -->
-                            <up-form-item borderBottom label="产出物图片">
+                            <up-form-item borderBottom label="产出物图片" v-if="+processMedType == 2">
                                 <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
 
                             <!-- 检验报告 -->
-                            <up-form-item borderBottom label="加工检验报告">
+                            <up-form-item borderBottom label="加工检验报告" v-if="+processMedType == 2">
                                 <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array" accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
                         </template>
@@ -125,12 +125,12 @@
                                 </view>
                             </up-form-item>
                             <!-- 产出物图片 -->
-                            <up-form-item borderBottom label="产出物图片">
+                            <up-form-item borderBottom label="产出物图片" v-if="+processMedType == 2">
                                 <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
 
                             <!-- 检验报告 -->
-                            <up-form-item borderBottom label="加工检验报告">
+                            <up-form-item borderBottom label="加工检验报告" v-if="+processMedType == 2">
                                 <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array" accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
                         </template>
@@ -156,6 +156,7 @@ const props = defineProps<{
     processId: string | number; // 加工任务 ID
     isEdit: boolean; // 是否编辑模式
     editData: any; // 要编辑的数据
+    processMedType: number; // 加工药材类型 1:种子 2:药材
 }>();
 const emit = defineEmits<{
     'update:show': [value: boolean];

src/plant/processing/processing-index/models/output.vue

@@ -51,12 +51,10 @@
         <view class="bg-#F6FAFE flex1 f-s-22 pd-16" v-else>
             <view v-for="(item, index) in outputList" :key="item?.id || index" class="mb-6">
                 <ut-row gap="10rpx">
-                    <ut-col class="d-flex a-c c-#666" :span="2">{{ String(Number(index) + 1).padStart(2, '0')
-                        }}</ut-col>
+                    <ut-col class="d-flex a-c c-#666" :span="2">{{ String(Number(index) + 1).padStart(2, '0') }}</ut-col>
                     <ut-col class="d-flex flex-cln j-c" :span="8">
                         <span class="c-#666">{{ item?.specnLevel }}</span>
-                        <span class="c-#999">{{ item?.finalSpecn }}{{ item?.finalUnit }}{{
-                            selectDictLabel(pt_final_form_type, item?.finalFormType) }}</span>
+                        <span class="c-#999">{{ item?.finalSpecn }}{{ item?.finalUnit }}{{ selectDictLabel(pt_final_form_type, item?.finalFormType) }}</span>
                     </ut-col>
                     <ut-col class="d-flex a-c c-#666" :span="8">{{ item?.capacity }}{{ item?.unit }}</ut-col>
                     <ut-col class="d-flex a-c" :span="3">
@@ -70,8 +68,7 @@
                     </ut-col>
                 </ut-row>
             </view>
-            <view class="d-flex a-c j-c pd-16 radius-10" style="border: 1rpx dashed #2289e0"
-                @click.stop="handleShowOutputModel">
+            <view class="d-flex a-c j-c pd-16 radius-10" style="border: 1rpx dashed #2289e0" @click.stop="handleShowOutputModel">
                 <up-icon name="plus" size="26rpx" color="#2289E0"></up-icon>
                 <span class="c-#2289E0 f-s-26">添加产出物</span>
             </view>
@@ -79,8 +76,7 @@
     </view>
     <!-- 添加/修改产出信息弹框 -->
     <root-portal>
-        <OutputInfo v-if="showOutputModel" v-model:show="showOutputModel" :type="processType" :processId="processId"
-            :isEdit="isEditOutput" :editData="editOutputData" @confirm="handleOutputConfirm" />
+        <OutputInfo v-if="showOutputModel" v-model:show="showOutputModel" :type="processType" :processId="processId" :processMedType="data?.processMedType" :isEdit="isEditOutput" :editData="editOutputData" @confirm="handleOutputConfirm" />
     </root-portal>
 </template>
 <script setup lang="ts">

src/plant/processing/processing-index/models/outputInfo.vue

@@ -9,15 +9,10 @@
                             <!-- 规格等级 -->
                             <up-form-item label="规格等级" required prop="specnLevel">
                                 <view class="flex1" @click="goToSpecLevel">
-                                    <up-input readonly v-model="formData.specnLevel" type="number" placeholder="请选择规格等级"
-                                        style="padding-left: 0; padding-right: 0" border="bottom" clearable
-                                        suffixIcon="arrow-down-fill" suffixIconStyle="color: #2A6D52;font-size: 22rpx">
-                                    </up-input>
+                                    <up-input readonly v-model="formData.specnLevel" type="number" placeholder="请选择规格等级" style="padding-left: 0; padding-right: 0" border="bottom" clearable suffixIcon="arrow-down-fill" suffixIconStyle="color: #2A6D52;font-size: 22rpx"> </up-input>
                                 </view>
                                 <view class="ml-20">
-                                    <up-checkbox :customStyle="{ marginBottom: '8px' }" label="统货" name="agree"
-                                        usedAlone :checked="formData.specnLevel == '统货'"
-                                        @change="handleSpecnLevelChange"> </up-checkbox>
+                                    <up-checkbox :customStyle="{ marginBottom: '8px' }" label="统货" name="agree" usedAlone :checked="formData.specnLevel == '统货'" @change="handleSpecnLevelChange"> </up-checkbox>
                                 </view>
                             </up-form-item>
                             <!-- 产量 -->
@@ -25,8 +20,7 @@
                                 <view class="flex1 d-flex">
                                     <view class="flex1 ov-hd" id="capacitypppp">
                                         <up-form-item border-bottom prop="capacity" class="form-item-top-padding-0">
-                                            <up-input v-model="formData.capacity" type="number" placeholder="请输入产量"
-                                                border="none" clearable></up-input>
+                                            <up-input v-model="formData.capacity" type="number" placeholder="请输入产量" border="none" clearable></up-input>
                                         </up-form-item>
                                     </view>
                                     <view class="pd-5"></view>
@@ -34,13 +28,11 @@
                                         <ut-action-sheet v-model="formData.unit" :tabs="pt_out_put_unit" title="选择单位">
                                             <up-form-item border-bottom prop="unit" class="form-item-top-padding-0">
                                                 <view class="flex1" style="line-height: 24px">
-                                                    <view v-if="formData?.unit" class="f-s-30 c-#333 f-w-5 flex1">{{
-                                                        formData?.unit }}</view>
+                                                    <view v-if="formData?.unit" class="f-s-30 c-#333 f-w-5 flex1">{{ formData?.unit }}</view>
                                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">单位</view>
                                                 </view>
                                                 <template #right>
-                                                    <up-icon size="22rpx" color="#2A6D52"
-                                                        name="arrow-down-fill"></up-icon>
+                                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
                                                 </template>
                                             </up-form-item>
                                         </ut-action-sheet>
@@ -48,15 +40,13 @@
                                 </view>
                             </up-form-item>
                             <!-- 产出物图片 -->
-                            <up-form-item borderBottom label="产出物图片">
-                                <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image"
-                                    width="210rpx" height="210rpx" style="card"></ut-upload>
+                            <up-form-item borderBottom label="产出物图片" v-if="+processMedType == 2">
+                                <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
 
                             <!-- 检验报告 -->
-                            <up-form-item borderBottom label="加工检验报告">
-                                <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array"
-                                    accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
+                            <up-form-item borderBottom label="加工检验报告" v-if="+processMedType == 2">
+                                <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array" accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
                         </template>
 
@@ -65,15 +55,10 @@
                             <!-- 规格等级 -->
                             <up-form-item label="规格等级" required prop="specnLevel">
                                 <view class="flex1" @click="goToSpecLevel">
-                                    <up-input readonly v-model="formData.specnLevel" type="number" placeholder="请选择规格等级"
-                                        style="padding-left: 0; padding-right: 0" border="bottom" clearable
-                                        suffixIcon="arrow-down-fill" suffixIconStyle="color: #2A6D52;font-size: 22rpx">
-                                    </up-input>
+                                    <up-input readonly v-model="formData.specnLevel" type="number" placeholder="请选择规格等级" style="padding-left: 0; padding-right: 0" border="bottom" clearable suffixIcon="arrow-down-fill" suffixIconStyle="color: #2A6D52;font-size: 22rpx"> </up-input>
                                 </view>
                                 <view class="ml-20">
-                                    <up-checkbox :customStyle="{ marginBottom: '8px' }" label="统货" name="agree"
-                                        usedAlone :checked="formData.specnLevel == '统货'"
-                                        @change="handleSpecnLevelChange"> </up-checkbox>
+                                    <up-checkbox :customStyle="{ marginBottom: '8px' }" label="统货" name="agree" usedAlone :checked="formData.specnLevel == '统货'" @change="handleSpecnLevelChange"> </up-checkbox>
                                 </view>
                             </up-form-item>
                             <!-- 产量 -->
@@ -81,8 +66,7 @@
                                 <view class="flex1 d-flex">
                                     <view class="flex1 ov-hd" id="capacitypppp">
                                         <up-form-item border-bottom prop="capacity" class="form-item-top-padding-0">
-                                            <up-input v-model="formData.capacity" type="number" placeholder="请输入产量"
-                                                border="none" clearable></up-input>
+                                            <up-input v-model="formData.capacity" type="number" placeholder="请输入产量" border="none" clearable></up-input>
                                         </up-form-item>
                                     </view>
                                     <view class="pd-5"></view>
@@ -90,13 +74,11 @@
                                         <ut-action-sheet v-model="formData.unit" :tabs="pt_out_put_unit" title="选择单位">
                                             <up-form-item border-bottom prop="unit" class="form-item-top-padding-0">
                                                 <view class="flex1" style="line-height: 24px">
-                                                    <view v-if="formData?.unit" class="f-s-30 c-#333 f-w-5 flex1">{{
-                                                        formData?.unit }}</view>
+                                                    <view v-if="formData?.unit" class="f-s-30 c-#333 f-w-5 flex1">{{ formData?.unit }}</view>
                                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">单位</view>
                                                 </view>
                                                 <template #right>
-                                                    <up-icon size="22rpx" color="#37A954"
-                                                        name="arrow-down-fill"></up-icon>
+                                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                                 </template>
                                             </up-form-item>
                                         </ut-action-sheet>
@@ -106,9 +88,7 @@
                             <!-- 切制形态 -->
                             <ut-action-sheet v-model="formData.finalFormType" :tabs="pt_final_form_type" title="选择切制形态">
                                 <up-form-item borderBottom label="切制形态" prop="finalFormType" required>
-                                    <view v-if="formData?.finalFormType" class="f-s-30 c-#333 f-w-5 flex1">{{
-                                        selectDictLabel(pt_final_form_type,
-                                            formData?.finalFormType) }}</view>
+                                    <view v-if="formData?.finalFormType" class="f-s-30 c-#333 f-w-5 flex1">{{ selectDictLabel(pt_final_form_type, formData?.finalFormType) }}</view>
                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择切制形态</view>
                                     <template #right>
                                         <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
@@ -117,8 +97,7 @@
                             </ut-action-sheet>
                             <!-- 具体切制形态 -->
                             <up-form-item borderBottom label="具体切制形态" prop="finalFormOther" required>
-                                <up-input v-model="formData.finalFormOther" placeholder="请输入具体切制形态" border="none"
-                                    clearable></up-input>
+                                <up-input v-model="formData.finalFormOther" placeholder="请输入具体切制形态" border="none" clearable></up-input>
                             </up-form-item>
 
                             <!-- 切制尺寸 -->
@@ -126,25 +105,19 @@
                                 <view class="flex1 d-flex">
                                     <view class="flex1 ov-hd" id="finalSpecnpppp">
                                         <up-form-item border-bottom prop="finalSpecn" class="form-item-top-padding-0">
-                                            <up-input v-model="formData.finalSpecn" type="number" placeholder="请输入切制尺寸"
-                                                border="none" clearable></up-input>
+                                            <up-input v-model="formData.finalSpecn" type="number" placeholder="请输入切制尺寸" border="none" clearable></up-input>
                                         </up-form-item>
                                     </view>
                                     <view class="pd-5"></view>
                                     <view class="min-w-100">
-                                        <ut-action-sheet v-model="formData.finalUnit" :tabs="pt_final_unit"
-                                            title="选择切制单位">
-                                            <up-form-item border-bottom prop="finalUnit"
-                                                class="form-item-top-padding-0">
+                                        <ut-action-sheet v-model="formData.finalUnit" :tabs="pt_final_unit" title="选择切制单位">
+                                            <up-form-item border-bottom prop="finalUnit" class="form-item-top-padding-0">
                                                 <view class="flex1" style="line-height: 24px">
-                                                    <view v-if="formData?.finalUnit" class="f-s-30 c-#333 f-w-5 flex1">
-                                                        {{
-                                                            selectDictLabel(pt_final_unit, formData?.finalUnit) }}</view>
+                                                    <view v-if="formData?.finalUnit" class="f-s-30 c-#333 f-w-5 flex1"> {{ selectDictLabel(pt_final_unit, formData?.finalUnit) }}</view>
                                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">单位</view>
                                                 </view>
                                                 <template #right>
-                                                    <up-icon size="22rpx" color="#37A954"
-                                                        name="arrow-down-fill"></up-icon>
+                                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                                 </template>
                                             </up-form-item>
                                         </ut-action-sheet>
@@ -152,15 +125,13 @@
                                 </view>
                             </up-form-item>
                             <!-- 产出物图片 -->
-                            <up-form-item borderBottom label="产出物图片">
-                                <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image"
-                                    width="210rpx" height="210rpx" style="card"></ut-upload>
+                            <up-form-item borderBottom label="产出物图片" v-if="+processMedType == 2">
+                                <ut-upload v-model="formData.imgs" :max-count="6" valueType="array" accept="image" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
 
                             <!-- 检验报告 -->
-                            <up-form-item borderBottom label="加工检验报告">
-                                <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array"
-                                    accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
+                            <up-form-item borderBottom label="加工检验报告" v-if="+processMedType == 2">
+                                <ut-upload v-model="formData.examinReport" :max-count="50" valueType="array" accept="image,file" width="210rpx" height="210rpx" style="card"></ut-upload>
                             </up-form-item>
                         </template>
                     </up-form>
@@ -193,6 +164,7 @@ const props = defineProps<{
     processId: string | number; // 加工任务 ID
     isEdit: boolean; // 是否编辑模式
     editData: any; // 要编辑的数据
+    processMedType: number; // 加工药材类型 1:种子 2:药材
 }>();
 const emit = defineEmits<{
     'update:show': [value: boolean];

src/plant/storage/finished-product/detail/index.vue

@@ -92,12 +92,11 @@
                     </view>
                 </view>
 
-                <view v-if="form?.examinReport && form?.examinReport.length" class="f-s-30 pd2-16-0 info-border-bottom">
+                <!-- <view v-if="form?.examinReport && form?.examinReport.length" class="f-s-30 pd2-16-0 info-border-bottom">
                     <view class="c-#666 mb-10">检验报告：</view>
                     <ut-album :urls="form?.examinReport"></ut-album>
-                </view>
-
-                <view v-if="form?.instoreType == '2'" class="f-s-30 pd2-16-0 info-border-bottom">
+                </view> 
+                 <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>
@@ -124,7 +123,7 @@
                 <view v-if="form?.vedios" class="f-s-30 pd2-16-0 info-border-bottom">
                     <view class="c-#666 mb-10">成品视频：</view>
                     <ut-album :urls="form?.vedios"></ut-album>
-                </view>
+                </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>
@@ -190,7 +189,7 @@ const navigateToInOutRecords = () => {
         url: '/plant/storage/stock-list/index',
         params: {
             id: did.value,
-            stockType: '4',
+            stockType: '3',
         },
     });
 };

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

@@ -9,9 +9,9 @@
             </view>
             <view class="d-flex a-c">
                 <view class="min-w-230 flex1">
-                    <ut-action-sheet v-model="form.instoreType" :tabs="tabs_pt_product_type" mode="custom" @change="onRefresh" title="选择入库类型">
+                    <ut-action-sheet v-model="form.productType" :tabs="tabs_pt_product_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_product_type, form.instoreType) || '全部' }} </view>
+                            <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(pt_product_type, form.productType) || '全部' }} </view>
                             <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
                         </view>
                     </ut-action-sheet>
@@ -48,7 +48,7 @@ import ProductItem from '@/plant/models/warehouseCard/product-item.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { pt_product_type } = toRefs<any>(proxy?.useDict('pt_product_type'));
 const list = ref<any[]>();
-const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '3' });
+const form = ref({ keyword: '', restFlag: '1', productType: '', storageType: '3' });
 const paging = ref();
 const tabs = ref([
     { label: '有库存', value: '1' },

src/tools/supervise-individual/index.vue

@@ -9,7 +9,7 @@
             <view class="pd-10"></view>
             <up-checkbox-group v-model="checkboxValue">
                 <template v-if="filteredLands.length > 0">
-                    <view class="d-flex w-100% j-sb b-radius bg-#fff mb-20 pd-24" v-for="(item, index) in filteredLands" :key="index" :name="item">
+                    <view class="d-flex w-100% j-sb b-radius bg-#fff mb-20 pd-24" v-for="(item, index) in filteredLands" :key="index" :name="item" @click="handleCardClick(item)">
                         <view class="flex1 ov-hd">
                             <view class="ov-hd tx-ov d-flex a-c">
                                 <view class="c-primary f-s-24 f-w-5 bg-#EBF6EE pd4-4-12-4-6 b-radius" style="font-style: italic">{{ Number(index) + 1 < 10 ? '0' + (Number(index) + 1) : Number(index) + 1 }}</view>
@@ -22,16 +22,11 @@
                         </view>
                         <view class="d-flex j-c a-c">
                             <view class="">
-                                <up-checkbox activeColor="#37A954" label="" :name="item" shape="circle"></up-checkbox>
+                                <up-checkbox activeColor="#37A954" label="" :name="item" shape="circle" @click.stop></up-checkbox>
                             </view>
                         </view>
                     </view>
                 </template>
-                <template v-else>
-                    <view class="d-flex j-c a-c pd-40">
-                        <ut-empty :show="true" text="暂无搜索结果" />
-                    </view>
-                </template>
             </up-checkbox-group>
         </view>
         <template #bottom>
@@ -88,6 +83,15 @@ const handleSelectAll = () => {
 const isAllSelected = computed(() => {
     return filteredLands.value.length > 0 && checkboxValue.value.length === filteredLands.value.length;
 });
+// 处理卡片点击事件，切换选中状态
+const handleCardClick = (item: any) => {
+    const index = checkboxValue.value.indexOf(item);
+    if (index > -1) {
+        checkboxValue.value.splice(index, 1); // 取消选中
+    } else {
+        checkboxValue.value.push(item); // 选中
+    }
+};
 onLoad(async (options: any) => {
     const res = await useClientRequest.get(`/plt-api/app/plantationTask/getInfo/${options?.taskId}`);
     lands.value = res?.data?.animalIds;