huangxw hace 4 semanas
padre
commit
a48564a812

+ 59 - 13
src/plant/storage/agro-product/info-update/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging class="" ref="paging" bgColor="#f7f7f7" paging-class="paging-btm-shadow" safe-area-inset-bottom scroll-with-animation>
         <template #top>
-            <ut-navbar :title="did ? '编辑农资入库' : '新增农资入库'" :fixed="false" border></ut-navbar>
+            <ut-navbar :title="did && mode === 'copy' ? '新增农资入库' : did ? '编辑农资入库' : '新增农资入库'" :fixed="false" border></ut-navbar>
         </template>
         <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
             <!-- 农资信息(复制自 info-edit 字段与顺序) -->
@@ -23,13 +23,39 @@
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
-
-                <!-- 入库数量与单位 -->
                 <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">
-                    <view class="f-s-30 c-333 f-w-5 flex1">{{ form?.capacity }}{{ form?.unit }}</view>
-                </up-form-item>
+                <!-- 入库数量与单位 -->
+                <template v-if="mode === 'copy'">
+                    <up-form-item label="入库量" 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>
+                </template>
+                <template v-else>
+                    <up-form-item label="入库量" prop="capacity" required class="form-item-bottom-padding-0">
+                        <view class="f-s-30 c-333 f-w-5 flex1">{{ form?.capacity }}{{ form?.unit }}</view>
+                    </up-form-item>
+                </template>
                 <view class="h-1" id="specpppp"></view>
                 <view class="h-1" id="specUnitpppp"></view>
                 <template v-if="!['kg', 'L'].includes(form?.unit as string)">
@@ -69,7 +95,6 @@
                         </div>
                     </up-form-item>
                 </template>
-
                 <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">
@@ -147,8 +172,17 @@
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>
-                <!-- 入库批号 -->
-                <up-form-item borderBottom label="入库批号" required prop="batchCode">
+              
+                    <!-- 入库批号 -->
+                <up-form-item v-if="mode === 'copy'" borderBottom label="入库批号" required prop="batchCode">
+                    <up-input v-model="form.batchCode" placeholder="请输入入库批号" border="none" clearable></up-input>
+                    <template #right>
+                        <up-button @click="generateBatchCode" type="primary"
+                            :customStyle="formItemBtnStyle">随机生成</up-button>
+                    </template>
+                </up-form-item>
+                  <!-- 入库批号 -->
+                <up-form-item v-else borderBottom label="入库批号" required prop="batchCode">
                     <view class="f-s-30 c-333 f-w-5 flex1">{{ form.batchCode }}</view>
                 </up-form-item>
                 <!-- 库房类型 -->
@@ -179,6 +213,7 @@
 </template>
 <script setup lang="ts">
 import { useClientRequest } from '@/utils/request';
+import { formItemBtnStyle } from '@/assets/styles/uview-plus';
 import { AgroProductInstoreAddTypeEnum } from '../models/type';
 import ContactUnitInput from '@/models/contact-unit-input/contact-unit-input.vue';
 import SelectWarehouseInput from '@/models/select-warehouse-input/select-warehouse-input.vue';
@@ -279,7 +314,7 @@ const submitForm = async () => {
             });
             try {
                 // 这里使用单条入库接口,后端若仍要求 batch,可根据需要包装成数组
-                const res = await useClientRequest.post('/plt-api/app/material/edit', form.value);
+                const res = mode.value === 'copy' ? await useClientRequest.post('/plt-api/app/material/instore', form.value) : await useClientRequest.post('/plt-api/app/material/edit', form.value);
                 uni.hideLoading();
                 if (!res || res.code !== 200) return;
                 uni.showToast({
@@ -306,7 +341,7 @@ const generateBatchCode = async () => {
     uni.showLoading({
         title: '生成中...',
     });
-    const res = await useClientRequest.post('/plt-api/app/material/getBatchCode', {
+    const res = await useClientRequest.post('/plt-api/app/plantationTask/getBatchCode', {
         plType: 'M',
         linkType: 'I',
     });
@@ -321,6 +356,7 @@ const generateBatchCode = async () => {
 };
 
 const did = ref('');
+const mode = ref('');
 // 获取详情(仓库信息)
 const getDetailById = async (id: string) => {
     if (!id) return;
@@ -330,12 +366,22 @@ const getDetailById = async (id: string) => {
             ...form.value,
             ...res.data,
         };
+        if (mode.value === 'copy') {
+            form.value.batchCode = '';
+            form.value.id = undefined;
+            form.value.instoreBizInfo.instoreDate = parseTime(new Date(), '{y}-{m}-{d}');
+            form.value.warehouses = [];
+            form.value.capacity = '';
+            form.value.spec = '';
+            form.value.specUnit = '';
+        }
     }
 };
 
 // 页面入参解析并加载
 onLoad((options: any) => {
     did.value = options?.id || '';
+    mode.value = options?.mode || '';
     getDetailById(did.value);
 });
 </script>
@@ -357,13 +403,13 @@ onLoad((options: any) => {
     z-index: 10;
 }
 :deep(.form-item-top-padding-0) {
-    >.u-form-item__body {
+    > .u-form-item__body {
         padding-top: 0rpx;
     }
 }
 
 :deep(.form-item-bottom-padding-0) {
-    >.u-form-item__body {
+    > .u-form-item__body {
         padding-bottom: 0rpx;
     }
 }

+ 24 - 5
src/plant/storage/agro-product/list/index.vue

@@ -9,20 +9,24 @@
                 <ut-tabs mode="subsection" v-model="form.restFlag" :tabs="tabs" @change="onRefresh"></ut-tabs>
             </view>
             <view class="h-86">
-                <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜农资名称、批号、库房、供应商" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                <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 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 pd3-10-24-24 p-rtv" @click.stop="$u.route({ url: '/plant/storage/agro-product/detail/index', params: { id: item.id } })">
+                <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 pd3-10-24-24 p-rtv"
+                        @click.stop="$u.route({ url: '/plant/storage/agro-product/detail/index', params: { id: item.id } })">
                         <view class="d-flex j-ed a-c mb-16">
                             <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?.materialName }}</span>
-                                <span class="f-s-24 c-#666">{{ selectDictLabel(pt_material_type, item?.materialType) }}</span>
+                                <span class="f-s-24 c-#666">{{ selectDictLabel(pt_material_type, item?.materialType)
+                                    }}</span>
                             </view>
                             <view>
                                 <view v-if="item?.examinReport?.length" class="tag-span c-primary bg-#EBF6EE">已检验</view>
@@ -101,6 +105,12 @@ const query = async (pageNum: number, pageSize: number) => {
 };
 // 暂存项左滑删除配置
 const optionsActionTemp = reactive([
+    {
+        text: '复制',
+        style: {
+            backgroundColor: '#37A954',
+        },
+    },
     {
         text: '删除',
         style: {
@@ -112,6 +122,15 @@ const optionsActionTemp = reactive([
 const clickTempSwipe = async (event: object) => {
     const { name, index } = event as any;
     if (index === 0) {
+        uni.$u.route({
+            type: 'navigateTo',
+            url: '/plant/storage/agro-product/info-update/index',
+            params: {
+                mode: 'copy',
+                id: name,
+            },
+        });
+    } else if (index === 1) {
         try {
             const res = await uni.showModal({
                 title: '删除提示',
@@ -153,10 +172,10 @@ onMounted(() => {
     box-sizing: border-box;
     padding: 12rpx;
 }
+
 .tag-span {
     padding: 4rpx 12rpx;
     font-size: 20rpx;
     border-radius: 18rpx;
 }
-
 </style>