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

src/pages/plant/port/index.vue

@@ -1,5 +1,9 @@
 <template>
+<<<<<<< HEAD
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom hide-no-more-inside>
+=======
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+>>>>>>> 84bf63a02fd3b1ba91f839dc1cba1e254e5d4b6c
         <template #top>
             <ut-navbar title="种养殖任务" :fixed="false">
                 <template #left><view class=""></view></template>

src/pages/plant/processing/index.vue

@@ -52,7 +52,7 @@
                             <span class="c-#666">加工负责人：</span>
                             <span class="c-#333 f-w-500">{{ item?.contactName }}</span>
                         </view>
-                        <view class="radius-10 bg-#f7f7f7 d-flex">
+                        <view class="radius-10 bg-#f7f7f7 d-flex mb-10">
                             <view class="bg-#EDF7F0 w-50 h-110 d-flex flex-cln a-c j-c c-primary f-w-5 f-s-24">
                                 <view class="">原</view>
                                 <view class="">料</view>

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

@@ -83,7 +83,7 @@
                         <up-form-item :borderBottom="false" label="养殖时间" required prop="queryType6">
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择养殖开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择养殖开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
                                     <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
@@ -368,7 +368,7 @@
                         <up-form-item :borderBottom="false" label="种植时间" required prop="queryType6">
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
                                     <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
@@ -540,7 +540,7 @@
                         <up-form-item :borderBottom="false" label="繁育日期" required prop="queryType6">
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
                                     <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>

src/plant/processing/processing-create/index.vue

@@ -7,15 +7,12 @@
             <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
                 <view class="bg-#fff pd-24 mb-20">
                     <!-- 加工方式 -->
-                    <ut-action-sheet v-model="form.processType" :tabs="pt_process_type" title="选择加工方式">
-                        <up-form-item borderBottom label="加工方式" required prop="processType">
-                            <view v-if="form?.processType" class="f-s-30 c-#333 f-w-5 flex1">{{ selectDictLabel(pt_process_type, form.processType) }}</view>
-                            <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工方式</view>
-                            <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
-                            </template>
-                        </up-form-item>
-                    </ut-action-sheet>
+                    <up-form-item borderBottom label="加工方式" required prop="processType">
+                        <view class="f-s-30 c-#666 f-w-5 flex1">{{ selectDictLabel(pt_process_type, form.processType) }}</view>
+                        <template #right>
+                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        </template>
+                    </up-form-item>
 
                     <!-- 加工对象 -->
                     <ut-action-sheet v-model="form.processMedType" :tabs="pt_stock_type" title="选择加工对象">
@@ -27,10 +24,19 @@
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
-
-                    <!-- 加工品种（暂留空） -->
-                    <up-form-item borderBottom label="加工品种" prop="varietyId">
-                        <up-input v-model="form.varietyName" placeholder="请选择加工品种" border="none" readonly clearable></up-input>
+                    <up-form-item v-if="+form?.processMedType == 1" @click="selectMedicine" borderBottom label="加工品种" required prop="varietyId">
+                        <view v-if="form.varietyName" class="f-s-30 c-333 f-w-5 flex1">{{ form.varietyName }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工品种</view>
+                        <template #right>
+                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        </template>
+                    </up-form-item>
+                    <up-form-item v-if="+form?.processMedType == 2" @click="selectMedicine" borderBottom label="加工品种" required prop="medicineCode">
+                        <view v-if="form.varietyName" class="f-s-30 c-333 f-w-5 flex1">{{ form.varietyName }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工品种</view>
+                        <template #right>
+                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        </template>
                     </up-form-item>
 
                     <!-- 加工日期 -->
@@ -145,6 +151,7 @@ const form = ref({
     processMedType: '',
     // 加工品种 ID
     varietyId: '',
+    medicineCode: '',
     // 加工品种名称
     varietyName: '',
     // 加工开始日期
@@ -209,6 +216,8 @@ const rules = reactive({
         { required: true, message: '请选择加工结束日期' },
         { validator: validateDateRange, trigger: 'blur' },
     ],
+    varietyId: [{ required: !!(+form.value.processMedType == 1), message: '请选择加工品种' }],
+    medicineCode: [{ required: !!(+form.value.processMedType == 2), message: '请选择加工品种' }],
     processCode: [
         { required: true, message: '请生成加工批号' },
         { validator: validateProcessCode, trigger: 'blur' },
@@ -295,9 +304,32 @@ const save = () => {
         true,
     );
 };
-
-onLoad(() => {
+const selectMedicine = () => {
+    if (form.value.processMedType == '1') {
+        uni.$once('updateBiologicalname', function (data) {
+            form.value.varietyName = data.msg.varietyName;
+            form.value.varietyId = data.msg.id;
+        });
+        uni.navigateTo({
+            url: '/tools/por-torganism/index',
+        });
+    } else if (form.value.processMedType == '2') {
+        uni.$once('medicineSelected', (medicine: any) => {
+            form.value.medicineCode = medicine.medicineCode;
+            form.value.varietyName = medicine.medicineName;
+        });
+        uni.$u.route({
+            type: 'navigateTo',
+            url: '/tools/select-medicine/index',
+            params: {
+                singleSelect: true,
+            },
+        });
+    }
+};
+onLoad((options: any) => {
     console.log('页面加载');
+    form.value.processType = options?.taskType;
 });
 </script>
 

src/tools/por-torganism/index.vue

@@ -106,6 +106,8 @@ const radiovalue1 = ref('苹果');
 const save = () => {
     const res = list.value.find((item) => item.id === radiovalue1.value);
     if (!res) return;
+    console.log('save', res);
+
     uni.$emit('updateBiologicalname', { msg: res });
     uni.navigateBack({ delta: 1 });
 };