huangxw 3 hete
szülő
commit
20a748a27c

+ 1 - 1
src/plant/storage/fresh-goods/detail/index.vue

@@ -171,7 +171,7 @@
             <view class="bg-#fff pd-24">
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">鲜货级别:</span>
-                    <span class="c-#333 f-w-600">{{ form?.seedLevel || '-' }}</span>
+                    <span class="c-#333 f-w-600">{{ form?.level || '-' }}</span>
                 </view>
                 <view class="f-s-30 pd2-16-0 info-border-bottom">
                     <span class="c-#666">入库类型:</span>

+ 2 - 2
src/plant/storage/fresh-goods/info-update/index.vue

@@ -115,8 +115,8 @@
                 <view class="startline-title">入库信息</view>
             </view>
             <view class="pd-24 bg-#fff">
-                <up-form-item borderBottom label="鲜货级别" prop="seedLevel">
-                    <up-input v-model="form.seedLevel" placeholder="请输入鲜货级别" border="none" clearable></up-input>
+                <up-form-item borderBottom label="鲜货级别" prop="level">
+                    <up-input v-model="form.level" placeholder="请输入鲜货级别" border="none" clearable></up-input>
                 </up-form-item>
                 <!-- 入库类型 -->
                 <up-form-item borderBottom label="入库类型" required prop="instoreType">

+ 1 - 1
src/plant/storage/fresh-goods/list/index.vue

@@ -28,7 +28,7 @@
                 <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
                     <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel || '' }}{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.level || '' }}{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="d-flex flex1 mb-10">

+ 1 - 1
src/plant/storage/loss-register/index.vue

@@ -81,7 +81,7 @@
                     </template>
                     <template v-if="info?.stockType === '4'">
                         <view class="d-flex j-sb a-c li-item-head mb-16">
-                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.seedLevel }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
+                            <view class="li-left-tag" :class="{ [`bg-instore-${info?.instoreType}`]: true }">{{ info?.level }}{{ selectDictLabel(pt_seed_instore_type, info?.instoreType) }}</view>
                             <view class="f-s-22 c-#666">{{ info?.instoreBizInfo?.instoreDate }}</view>
                         </view>
                         <view class="mb-10">

+ 196 - 2
src/plant/storage/medicine/list/index.vue

@@ -1,3 +1,197 @@
 <template>
-    <view>xx</view>
-</template>
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+        <template #top>
+            <ut-navbar title="鲜货库" :fixed="false"></ut-navbar>
+        </template>
+
+        <view class="pd3-24-24-0">
+            <view class="mb-20">
+                <ut-tabs mode="subsection" v-model="form.restFlag" :tabs="tabs" @change="onRefresh"></ut-tabs>
+            </view>
+            <view class="d-flex a-c">
+                <view class="min-w-230 flex1">
+                    <ut-action-sheet v-model="form.instoreType" :tabs="[{ label: '全部', value: '' }, ...pt_fresh_instore_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_fresh_instore_type, form.instoreType) || '全部' }} </view>
+                            <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
+                        </view>
+                    </ut-action-sheet>
+                </view>
+                <view class="h-86 pl-20 w-100%">
+                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜名称、批号、库房、供应商" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                </view>
+            </view>
+            <view></view>
+        </view>
+        <view class="pd-24 bg-#f7f7f7">
+            <up-swipe-action>
+                <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
+                    <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
+                        <view class="d-flex j-sb a-c li-item-head mb-16">
+                            <view class="li-left-tag" :class="{ [`bg-instore-${item?.instoreType}`]: true }">{{ item?.seedLevel || '' }}{{ selectDictLabel(pt_fresh_instore_type, item?.instoreType) }}</view>
+                            <view class="f-s-22 c-#666">{{ item?.instoreBizInfo?.instoreDate }}</view>
+                        </view>
+                        <view class="d-flex flex1 mb-10">
+                            <view class="flex1">
+                                <span class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.variety }}</span>
+                                <span v-if="item?.partName" class="f-s-24 c-#666">{{ item?.partName }}</span>
+                            </view>
+                            <view>
+                                <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>
+                                <view v-else class="tag-span c-danger bg-#F9ECEA">未检验</view>
+                            </view>
+                        </view>
+                        <template v-if="item?.instoreType == '2'">
+                            <view class="pd2-4-0 f-s-28">
+                                <span class="c-#666">入库批号:</span>
+                                <span class="c-#333 f-w-500">{{ item?.batchCode || '-' }}</span>
+                            </view>
+                            <view v-if="item?.supplierId" class="pd2-4-0 f-s-28">
+                                <span class="c-#666">供应商:</span>
+                                <span class="c-#333 f-w-500">{{ item?.supplierInfo?.cusName || '-' }}</span>
+                            </view>
+                        </template>
+                        <template v-if="item?.instoreType == '3'">
+                            <view class="pd2-4-0 f-s-28">
+                                <span class="c-#666">采收批号:</span>
+                                <span class="c-#333 f-w-500">{{ item?.harvestInfo?.harvestCode || '-' }}</span>
+                            </view>
+                            <view class="pd2-4-0 f-s-28">
+                                <span class="c-#666">采收基地:</span>
+                                <span class="c-#333 f-w-500">
+                                    {{ item?.harvestInfo?.baseInfo?.baseName || '-' }}
+                                </span>
+                            </view>
+                        </template>
+
+                        <view v-if="item?.warehouses?.length" class="pd2-4-0 f-s-28">
+                            <span class="c-#666">存放库房:</span>
+                            <span class="c-#333 f-w-500">{{ getStorageRoomNames(item?.warehouses) || '-' }}</span>
+                        </view>
+                        <view class="pd2-4-0 f-s-28">
+                            <span class="c-#666">入库量:</span>
+                            <span class="c-#333 f-w-500">{{ item?.capacity }}{{ item?.unit }}</span>
+                        </view>
+                        <view class="d-flex">
+                            <view v-if="item?.inputAmount" class="pd2-4-0 f-s-28 flex1">
+                                <span class="c-#666">出库量:</span>
+                                <span class="c-#333 f-w-500">{{ item?.inputAmount || '0' }}{{ item?.unit }}</span>
+                            </view>
+                            <view v-if="item?.restAmount" class="pd2-4-0 f-s-28 flex1">
+                                <span class="c-danger">剩余量:</span>
+                                <span class="c-danger f-w-500">{{ item?.restAmount || '0' }}{{ item?.unit }}</span>
+                            </view>
+                        </view>
+                    </view>
+                </up-swipe-action-item>
+            </up-swipe-action>
+        </view>
+
+        <template #empty>
+            <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
+                <ut-empty class="mg-at" color="#ccc" size="28rpx">暂无鲜货信息,点击下方+号新增吧</ut-empty>
+            </view>
+        </template>
+    </z-paging>
+</template>
+<script setup lang="ts">
+import { useClientRequest } from '@/utils/request';
+import { selectDictListClass } from '@/utils/ruoyi';
+import { getStorageRoomNames } from '@/utils/common';
+import FreshGoodsBottom from './model/fresh-goods-bottom.vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { pt_fresh_instore_type } = toRefs<any>(proxy?.useDict('pt_fresh_instore_type'));
+const list = ref<any[]>();
+const form = ref({ keyword: '', restFlag: '1', instoreType: '', storageType: '4' });
+const paging = ref();
+const tabs = ref([
+    { label: '有库存', value: '1' },
+    { label: '无库存', value: '0' },
+]);
+
+const changeSeach = () => {
+    paging.value.reload();
+};
+const query = async (pageNum: number, pageSize: number) => {
+    const params = {
+        pageNum,
+        pageSize,
+        ...form.value,
+    };
+    const res = await useClientRequest.get('/plt-api/app/storage/list', params);
+    if (res) {
+        const { rows } = res;
+        paging.value.complete(rows);
+    }
+};
+// 暂存项左滑删除配置
+const optionsActionTemp = reactive([
+    {
+        text: '删除',
+        style: {
+            backgroundColor: '#F74C30',
+        },
+    },
+]);
+// 暂存项删除点击(本地移除)
+const clickTempSwipe = async (event: object) => {
+    const { name, index } = event as any;
+    if (index === 0) {
+        try {
+            const res = await uni.showModal({
+                title: '删除提示',
+                content: '确定删除鲜货信息吗?',
+                confirmColor: '#F74C30',
+            });
+            if (!res.confirm) return;
+            await uni.showLoading({
+                title: '删除中...',
+                mask: true,
+            });
+            await useClientRequest.get(`/plt-api/app/storage/removeById/${name}`);
+            uni.hideLoading();
+            uni.showToast({
+                title: '删除成功',
+                icon: 'success',
+            });
+            paging.value?.reload();
+        } catch (error) {
+            console.error('删除暂存鲜货信息失败:', error);
+        }
+    }
+};
+
+const onRefresh = () => {
+    paging.value.reload();
+};
+onMounted(() => {
+    uni.$on('refreshStorageRoomList', () => {
+        onRefresh();
+    });
+});
+</script>
+<style lang="scss" scoped>
+.search-select-item {
+    height: 86rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    box-sizing: border-box;
+    padding: 12rpx;
+}
+.tag-span {
+    padding: 4rpx 12rpx;
+    font-size: 20rpx;
+    border-radius: 18rpx;
+}
+.li-item-head {
+    margin-left: -24rpx;
+    margin-top: -24rpx;
+}
+.li-left-tag {
+    padding: 6rpx 16rpx;
+    color: #fff;
+    border-radius: 16rpx 0 16rpx 0;
+    font-size: 20rpx;
+    font-weight: 500;
+}
+</style>