Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/plant/storage/agro-product/info-edit/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging class="" ref="paging" bgColor="#fff" paging-class="paging-btm-shadow" safe-area-inset-bottom scroll-with-animation>
         <template #top>
-            <ut-navbar :title="optionsParam?.mode == 'edit' ? '编辑种源入库信息' : '添加种源入库信息'" :fixed="false" border></ut-navbar>
+            <ut-navbar :title="optionsParam?.mode == 'edit' ? '编辑农资入库信息' : '添加农资入库信息'" :fixed="false" border></ut-navbar>
         </template>
         <view class="pd-24">
             <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
@@ -23,6 +23,7 @@
 
                 <!-- 入库数量与单位 -->
                 <view class="h-1" id="capacitypppp"></view>
+                <view class="h-1" id="unitpppp"></view>
                 <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
                     <div class="flex1 d-flex">
                         <div class="flex1 ov-hd">
@@ -46,6 +47,31 @@
                         </div>
                     </div>
                 </up-form-item>
+                <view class="h-1" id="capacitypppp"></view>
+                <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
+                    <div class="flex1 d-flex">
+                        <div class="flex1 ov-hd">
+                            <up-form-item prop="capacity" border-bottom class="form-item-top-padding-0">
+                                <up-input v-model="form.capacity" placeholder="请输入入库量" border="none" clearable></up-input>
+                            </up-form-item>
+                        </div>
+                        <div class="pd-5"></div>
+                        <div class="min-w-200">
+                            <ut-action-sheet v-model="form.unit" :tabs="pt_materail_unit" mode="custom" title="选择单位">
+                                <up-form-item prop="unit" border-bottom class="form-item-top-padding-0">
+                                    <view class="flex1" style="line-height: 24px">
+                                        <view v-if="form.unit" class="f-s-30 c-333 f-w-5 text-center">{{ selectDictLabel(pt_materail_unit, form.unit) }}</view>
+                                        <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
+                                    </view>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-action-sheet>
+                        </div>
+                    </div>
+                </up-form-item>
+
                 <view class="h-1" id="sourceTypepppp"></view>
                 <ut-action-sheet :tabs="pt_source_type" mode="custom" title="农资来源" v-model="form.sourceType">
                     <up-form-item borderBottom label="农资来源" required prop="sourceType">
@@ -119,7 +145,7 @@ import ContactUnitInput from '@/models/contact-unit-input/contact-unit-input.vue
 import PickerAreaInput from '@/models/picker-area-input/picker-area-input.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { pt_material_type, pt_source_type, pt_materail_unit, pt_mother_father_flag, pt_fungus_code_type, pt_breeding_materials, yes_no, pt_cus_type, pt_cpy_type, pt_gen_unit } = toRefs<any>(proxy?.useDict('pt_material_type', 'pt_source_type','pt_mother_father_flag', 'pt_op_method', 'pt_materail_unit', 'pt_fungus_code_type', 'pt_breeding_materials', 'yes_no', 'pt_cus_type', 'pt_cpy_type', 'pt_gen_unit'));
+const { pt_material_type, pt_source_type, pt_materail_unit, pt_mother_father_flag, pt_fungus_code_type, pt_breeding_materials, yes_no, pt_cus_type, pt_cpy_type, pt_gen_unit } = toRefs<any>(proxy?.useDict('pt_material_type', 'pt_source_type', 'pt_mother_father_flag', 'pt_op_method', 'pt_materail_unit', 'pt_fungus_code_type', 'pt_breeding_materials', 'yes_no', 'pt_cus_type', 'pt_cpy_type', 'pt_gen_unit'));
 const paging = ref<any>(null);
 const selectContactUnitShow = ref(false);
 const upFormRef = ref<any>(null);
@@ -140,9 +166,9 @@ const form = ref<seedInfoListType>({
     generationMaterial: '',
 });
 const rules = reactive({
-    seedType: [{ required: true, message: '请选择种源类型' }],
+    seedType: [{ required: true, message: '请选择农资类型' }],
     varietyId: [{ required: true, message: '请选择物种基原' }],
-    seedSource: [{ required: true, message: '请选择种源来源' }],
+    seedSource: [{ required: true, message: '请选择农资来源' }],
     'instoreBizInfo.motherFatherFlag': [{ required: true, message: '请选择父母本情况' }],
     'instoreBizInfo.genCount': [
         {

src/plant/storage/seed-source/info-edit/index.vue

@@ -201,6 +201,7 @@
 
                 <!-- 入库数量与单位 -->
                 <view class="h-1" id="capacitypppp"></view>
+                <view class="h-1" id="unitpppp"></view>
                 <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
                     <div class="flex1 d-flex">
                         <div class="flex1 ov-hd">

src/plant/storage/seed-source/info-update/index.vue

@@ -205,6 +205,7 @@
 
                 <!-- 入库数量与单位 -->
                 <view class="h-1" id="capacitypppp"></view>
+                <view class="h-1" id="unitpppp"></view>
                 <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
                     <div class="flex1 d-flex">
                         <div class="flex1 ov-hd">