huangxw 1 周之前
父節點
當前提交
f1404ab546
共有 3 個文件被更改,包括 29 次插入14 次删除
  1. 2 2
      src/pages/plant/processing/index.vue
  2. 16 1
      src/plant/models/pack-card.vue
  3. 11 11
      src/plant/packaging/list/index.vue

+ 2 - 2
src/pages/plant/processing/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" bgColor="#F7F7F7">
         <template #top v-if="!showHeader">
-            <ut-navbar title="产地加工及包装赋码任务" :fixed="false" :breadcrumb="false">
+            <ut-navbar title="产地加工及包装赋码" :fixed="false" :breadcrumb="false">
                 <template #left>
                     <view class=""></view>
                 </template>
@@ -13,7 +13,7 @@
                 <up-navbar :fixed="true" :bgColor="navBarBgColor">
                     <template #left>
                         <view class="d-flex a-c pb-5" id="topup-navbar" :style="{ width: `${bubble.left - 30}px` }">
-                            <text class="f-s-40 c-333 f-w-5 w-s-no">产地加工及包装赋码任务</text>
+                            <text class="f-s-40 c-333 f-w-5 w-s-no">产地加工及包装赋码</text>
                             <view class="flex1"></view>
                         </view>
                     </template>

+ 16 - 1
src/plant/models/pack-card.vue

@@ -7,7 +7,7 @@
                 <span>包装</span>
             </view>
         </view>
-        <view class="pd-20">
+        <view class="pd-20 p-rtv">
             <view class="d-flex a-c">
                 <view class="flex1 ov-hd">
                     <span class="f-s-34 c-#333 f-w-5 mr-10">{{ item?.proName || '-' }}</span>
@@ -47,9 +47,11 @@
                     <span class="c-#333 f-w-5">{{ item?.actualCount - item?.printCount }}{{ item?.unit }}</span>
                 </view>
             </view>
+          
             <slot></slot>
         </view>
     </view>
+    <view v-if="+item?.bgStatus" class="fmz-status">赋码中...</view>
 </template>
 <script lang="ts" setup>
 const props = defineProps({
@@ -81,4 +83,17 @@ const emit = defineEmits(['click']);
 .bg-pack-2 {
     background-color: #37A954;
 }
+.fmz-status {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    font-size: 26rpx;
+    color: #F74C30;
+    padding: 120rpx 24rpx 0;
+    z-index: 10;
+    opacity: 0.8;
+    text-align: right;
+}
 </style>

+ 11 - 11
src/plant/packaging/list/index.vue

@@ -23,9 +23,9 @@
         </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 @click="$u.route({ url: '/plant/packaging/detail/index', params: { id: item?.id } })" class="b-radius bg-#fff p-rtv">
-                        <pack-card :item="item" :dict="{ pt_pack_ref_type }" isArrow>
+                <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :disabled="+item?.bgStatus" :options="optionsActionTemp" @click="clickTempSwipe($event, item)" class="mb-20 b-radius">
+                    <view  class="b-radius bg-#fff p-rtv">
+                        <pack-card :item="item" :dict="{ pt_pack_ref_type }" isArrow @click="$u.route({ url: '/plant/packaging/detail/index', params: { id: item?.id } })">
                             <view class="h-1 bg-#F7F7F7 mg2-10-0"></view>
                             <view class="pt-10 d-flex">
                                 <view class="flex1"></view>
@@ -39,12 +39,12 @@
                                         :customStyle="formItemBtnListStyle"
                                         >查看批次信息</up-button>
                                     <template v-if="item.refType == '2'">
-                                        <up-button :customStyle="formItemBtnListStyle" v-if="+item?.actualCount - item?.printCount" @click.stop="$u.route({ url: '/plant/print/print-self/index', params: { packId: item?.id, autoRelationId: item?.autoRelationId, unit: item?.unit, printedCount: item?.actualCount - item?.printCount } })" class="ml-10" color="#37A954">立即打印</up-button>
-                                        <up-button :customStyle="formItemBtnListStyle" v-if="+item?.printCount" @click="$u.route({ url: '/plant/packaging/detail/index', params: { id: item?.id, viewMode: 'print' } })" class="ml-10" color="#37A954">查看打印记录</up-button>
+                                        <up-button :customStyle="formItemBtnListStyle" :disabled="+item?.bgStatus" v-if="+item?.actualCount - item?.printCount" @click.stop="$u.route({ url: '/plant/print/print-self/index', params: { packId: item?.id, autoRelationId: item?.autoRelationId, unit: item?.unit, printedCount: item?.actualCount - item?.printCount } })" class="ml-10" color="#37A954">立即打印</up-button>
+                                        <up-button :customStyle="formItemBtnListStyle" :disabled="+item?.bgStatus" v-if="+item?.printCount" @click="$u.route({ url: '/plant/packaging/detail/index', params: { id: item?.id, viewMode: 'print' } })" class="ml-10" color="#37A954">查看打印记录</up-button>
                                     </template>
                                     <template v-if="item.refType == '1'">
-                                        <up-button :customStyle="formItemBtnListStyle" @click="$u.route({ url: '/plant/packaging/batch-link/index', params: { packId: item?.id } })" v-if="(+item?.planCount > +item?.actualCount)" class="ml-10" color="#91C747">批量关联</up-button>
-                                        <up-button :customStyle="formItemBtnListStyle" v-if="+item?.actualCount" class="ml-10" color="#91C747">查看关联记录</up-button>
+                                        <up-button :customStyle="formItemBtnListStyle" :disabled="+item?.bgStatus" @click="$u.route({ url: '/plant/packaging/batch-link/index', params: { packId: item?.id } })" v-if="(+item?.planCount > +item?.actualCount)" class="ml-10" color="#91C747">批量关联</up-button>
+                                        <up-button :customStyle="formItemBtnListStyle" :disabled="+item?.bgStatus" v-if="+item?.actualCount" class="ml-10" color="#91C747">查看关联记录</up-button>
                                     </template>
                                 </view>
                             </view>
@@ -102,13 +102,13 @@ const optionsActionTemp = reactive([
     },
 ]);
 // 暂存项删除点击(本地移除)
-const clickTempSwipe = async (event: object) => {
+const clickTempSwipe = async (event: object, item: any) => {
     const { name, index } = event as any;
     if (index === 0) {
         try {
             const res = await uni.showModal({
                 title: '删除提示',
-                content: '确定删除鲜货信息吗?',
+                content: '删除后,分包重量将退回相应的库存,是否确认删除?',
                 confirmColor: '#F74C30',
             });
             if (!res.confirm) return;
@@ -116,7 +116,7 @@ const clickTempSwipe = async (event: object) => {
                 title: '删除中...',
                 mask: true,
             });
-            await useClientRequest.get(`/plt-api/app/storage/removeById/${name}`);
+            await useClientRequest.get(`/plt-api/app/packTask/delete/${name}`);
             uni.hideLoading();
             uni.showToast({
                 title: '删除成功',
@@ -124,7 +124,7 @@ const clickTempSwipe = async (event: object) => {
             });
             paging.value?.reload();
         } catch (error) {
-            console.error('删除暂存鲜货信息失败:', error);
+            console.error('删除暂存包装任务失败:', error);
         }
     }
 };