lisy 1 settimana fa
parent
commit
6f4313f206

+ 1 - 1
.env.development

@@ -4,4 +4,4 @@ VITE_TITLE = 林草平台
 # 开发环境配置
 VITE_APP_ENV = 'development'
 # api请求地址
-VITE_API_BASE_URL = 'https://dm.yujin.shuziyunyao.com/api'
+VITE_API_BASE_URL = 'https://dm.yujin.shuziyunyao.com/api:8888'

+ 7 - 1
src/plant/port/port-create/index.vue

@@ -715,6 +715,7 @@ const { planting_mg_unit, inoculation_unit, inoculation_dosage_unit, transplant_
 const form = ref({
     deawerData: null,
     baseId: null,
+    landIds: [],
     taskType: null,
     gapFlag: null,
     mgMethod: null,
@@ -733,7 +734,7 @@ const form = ref({
         plantingMgAmount: null,
         plantingMgUnit: null,
     },
-    plantingAmount: null,
+    plantingAmount: '',
     remark: null,
     delegateFlag: '0',
     delegateInfo: { cusId: null, crediteCode: null, cusName: null },
@@ -929,6 +930,11 @@ function onDrawerConfirm(data: any) {
     });
     //确认养殖区域的个数
     form.value.breedScale = data.data?.length;
+    if (data?.aloneChecked) {
+        form.value.landIds = [];
+    } else {
+        form.value.landIds = data?.checkBox;
+    }
 }
 // 处理Baseinfo组件的关闭事件
 function handleBaseinfoClose() {

+ 7 - 5
src/tools/por-torganism/index.vue

@@ -10,15 +10,15 @@
         </template>
         <view class="pd-24" v-if="!showSearch">
             <template v-if="speArray.length">
-                <view class="f-s-32 c-#333 f-w-5 mb-20">主营品种</view>
+                <view class="f-s-32 c-#333 f-w-5 mb-20">快捷选择主营品种</view>
                 <view class="d-flex a-c f-w-w">
                     <spe-lable class="mr-20 mb-20" v-for="(item, index) in speArray" :key="index" :text="item?.medicineName" size="30rpx" :id="item?.id" @click="changeSpe(item?.medicineName)" />
                 </view>
             </template>
             <template>
-                <ut-empty></ut-empty>
+                <ut-empty text=""></ut-empty>
                 <view class="d-flex flex-cln j-c a-c">
-                    <view class="c-#ccc f-s-28">您可以直接搜索,或前往<text class="c-primary">基地-主营品种配置</text>页面进行</view>
+                    <view class="c-#ccc f-s-28">您可以<text class="c-primary">直接搜索,</text>或前往<text class="c-primary">基地-主营品种配置</text>页面进行</view>
                     <view class="c-#ccc f-s-28">主营品种配置,配置后下次即可快捷选择。</view>
                 </view>
             </template>
@@ -27,7 +27,7 @@
             <view class="f-s-32 c-#333 f-w-5 mb-20">搜索结果</view>
             <view class="pd-30 d-flex bg-#FBFDFB border-#37A954 b-radius mb-20" v-for="(item, index) in list" :key="index">
                 <up-radio-group v-model="radiovalue1">
-                    <view class="d-flex w-100%">
+                    <view @click="radiovalue1 = item?.id" class="d-flex w-100%">
                         <view class="">
                             <view class="mb-20 ov-hd tx-ov">
                                 <text class="c-#333 f-s-34 f-w-5 mr-5">{{ item?.varietyName }}</text>
@@ -44,7 +44,9 @@
                         </view>
                         <view class="flex1"></view>
                         <view class="d-flex j-c a-c">
-                            <up-radio activeColor="#37A954" label="" :name="item?.id"></up-radio>
+                            <view @click.stop class="">
+                                <up-radio activeColor="#37A954" label="" :name="item?.id"> </up-radio>
+                            </view>
                         </view>
                     </view>
                 </up-radio-group>

+ 2 - 1
src/utils/request.ts

@@ -20,7 +20,8 @@ const getHeader = () => {
 
 // 获取host地址
 export const request = ({ url, method = 'GET', data = {}, isToken = true, header = null }: any) => {
-    const baseUrl = import.meta.env.VITE_API_BASE_URL || 'http://localhost:3000';
+    // const baseUrl = import.meta.env.VITE_API_BASE_URL || 'http://192.168.1.26:8080';
+    const baseUrl = 'http://192.168.1.26:8888';
     if (isToken && useInfoStore().isTokenExpired()) {
         uni.hideLoading();
         useInfoStore().removeToken();