7
0

2 Коммиты 6f2db86c4e ... 851ecd8479

Автор SHA1 Сообщение Дата
  huangxw 851ecd8479 Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx 4 дней назад
  huangxw 9f1aa731ea 修改培养架选择 4 дней назад

+ 0 - 3
src/plant/code/code-list/index.vue

@@ -39,9 +39,6 @@
                     image="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/noEmpty.png">暂无追溯码数据</ut-empty>
             </view>
         </template>
-        <template #bottom>
-            <ut-tabar activeTab="more"></ut-tabar>
-        </template>
     </z-paging>
 
     <!-- 悬浮按钮 -->

+ 36 - 2
src/plant/code/code-query/index.vue

@@ -1,3 +1,37 @@
 <template>
-    <view>xx</view>
-</template>
+    <z-paging ref="paging" bgColor="#f7f7f7" hide-no-more-inside>
+        <template #top>
+            <ut-navbar title="追溯码查询" :fixed="false"></ut-navbar>
+        </template>
+        <view class="pd-20">
+            <up-button class="bg-fff" type="primary" plain>
+                <image class="w-36 h-36 mr-10" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/common/primary_scan.png" mode="widthFix" />
+                <span>请扫描追溯码查询</span>
+            </up-button>
+        </view>
+        <view v-if="!info">
+            <ut-empty class="mg-at" color="#ccc" size="28rpx"
+                image="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/noEmpty.png">
+                <view class="text-center">暂无查询结果</view>
+                <view class="text-center">点击上方按钮扫描追溯码查询</view>
+            </ut-empty>
+        </view>
+        <view v-if="info">
+            <view></view>
+        </view>
+    </z-paging>
+</template>
+
+<script setup lang="ts">
+import { useClientRequest } from '@/utils/request';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { pt_code_downflag } = toRefs<any>(proxy?.useDict('pt_code_downflag'));
+const paging = ref();
+const info = ref<any>(null);
+
+onMounted(() => {
+
+});
+</script>
+
+<style scoped lang="scss"></style>

+ 12 - 0
src/tools/select-cultivation-location/index.vue

@@ -66,6 +66,8 @@ const query = async (pageNum: number, pageSize: number) => {
                     checkedAll: false,
                     id: item.id,
                     landName: item.landName,
+                    layers: item.layers,
+                    capacityAmount: item.capacityAmount,
                     checkedList: [],
                 };
             } else {
@@ -73,6 +75,8 @@ const query = async (pageNum: number, pageSize: number) => {
                 const layers = Number(item?.layers || 0);
                 const capacityAmount = Number(item?.capacityAmount || 0);
                 const totalCapacity = layers * capacityAmount;
+                checkedItem.layers = layers;
+                checkedItem.capacityAmount = capacityAmount;
                 checkedItem.checkedAll = checkedItem.checkedList.length === totalCapacity;
             }
         });
@@ -138,6 +142,8 @@ const handleCheckedAllChange = (item: any, value: boolean | { value?: boolean })
     checkeds.value[item.id] = {
         checkedAll: checked,
         id: item.id,
+        layers: item.layers,
+        capacityAmount: item.capacityAmount,
         landName: item.landName,
         checkedList: checked ? buildCheckedList(item) : [],
     };
@@ -155,6 +161,8 @@ const goSelectLayersAmount = (item: any) => {
                 checkedAll: checkedList.length === Number(landItem?.layers || 0) * Number(landItem?.capacityAmount || 0),
                 id: data.id,
                 landName: landItem?.landName || '',
+                layers: landItem?.layers || 0,
+                capacityAmount: landItem?.capacityAmount || 0,
                 checkedList,
             };
         }
@@ -233,6 +241,8 @@ const handleConfirmSelection = () => {
     const selectedData = Object.values(checkeds.value).map((item: any) => ({
         id: item.id,
         landName: item.landName,
+        layers: item.layers,
+        capacityAmount: item.capacityAmount,
         checkedList: item.checkedList,
     }));
     console.log('确认选择的数据:', selectedData);
@@ -255,6 +265,8 @@ onLoad(() => {
                     checkeds.value[item.id] = {
                         id: item.id,
                         landName: item.landName,
+                        layers: item.layers || 0,
+                        capacityAmount: item.capacityAmount || 0,
                         checkedList: normalizeCheckedList(item.checkedList),
                     };
                 });