Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/main.ts

@@ -38,6 +38,9 @@ const uviewProps: any = {
         checkbox: {
             activeColor: '#37A954',
         },
+        swipeActionItem: {
+            threshold: 40
+        }
     },
 };
 export function createApp() {

src/pages/plant/base/index.vue

@@ -109,7 +109,7 @@
                         <template>
                             <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">
+                                    :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/base/base-detail/index', params: { id: item.id } })">
                                         <view class="c-333 f-s-34 pd-5 f-w-5">{{ item?.baseName }}</view>

src/pages/plant/port/index.vue

@@ -25,7 +25,7 @@
         </view>
         <view class="pd-24 pt-0">
             <up-swipe-action>
-                <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="form?.status == '1' ? options2 : options" class="mb-20" @click="clickTempSwipe">
+                <up-swipe-action-item v-for="(item, index) in list"  :key="index" :name="item?.id" :options="form?.status == '1' ? options2 : options" class="mb-20" @click="clickTempSwipe">
                     <task :data="item" :status="form?.status" @cardClick="$u.route({ type: 'navigateTo', url: '/plant/port/port-detail/index', params: { id: item?.id } })" @toSupervise="$u.route({ type: 'navigateTo', url: '/plant/port/port-supervise/index', params: { id: item?.id } })" @toInformation="$u.route({ type: 'navigateTo', url: '/plant/port/port-listinfo/index', params: { id: item?.id } })" @toHarvest="$u.route({ type: 'navigateTo', url: '/plant/port/port-harvest/index', params: { id: item?.id } })" />
                 </up-swipe-action-item>
             </up-swipe-action>

src/plant/base/base-edit/index.vue

@@ -147,7 +147,7 @@
                 <view class="pd-24 bg-#fff">
                     <up-swipe-action>
                         <template v-for="(item, index) in form.landInfoList" :key="index">
-                            <up-swipe-action-item class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑地块信息')">
+                            <up-swipe-action-item  class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑地块信息')">
                                 <view class="plot-item pd-24">
                                     <view class="d-flex mb-16">
                                         <view class="f-s-32 f-w-5 c-#333 flex1 mr-10">{{ item?.landName || '-' }}</view>
@@ -174,7 +174,7 @@
                 <view class="pd-24 bg-#fff">
                     <up-swipe-action>
                         <template v-for="(item, index) in form.landInfoList" :key="index">
-                            <up-swipe-action-item class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑圈舍信息')">
+                            <up-swipe-action-item   class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑圈舍信息')">
                                 <view class="plot-item pd-24">
                                     <view class="d-flex mb-16">
                                         <view class="f-s-32 f-w-5 c-#333 flex1 mr-10">{{ item?.landName || '-' }}</view>
@@ -202,7 +202,7 @@
                 <view class="pd-24 bg-#fff">
                     <up-swipe-action>
                         <template v-for="(item, index) in form.landInfoList" :key="index">
-                            <up-swipe-action-item class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑培养架信息')">
+                            <up-swipe-action-item  class="mb-20" :options="options" @click="clickPlotSwipe($event, item, index, '编辑培养架信息')">
                                 <view class="plot-item pd-24">
                                     <view class="d-flex mb-16">
                                         <view class="f-s-32 f-w-5 c-#333 flex1 mr-10">{{ item?.landName || '-' }}</view>

src/plant/base/gap-base-info/index.vue

@@ -20,7 +20,7 @@
             <template>
                 <view class="pl-25 pr-25">
                     <up-swipe-action>
-                        <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :disabled="item?.res !== '2'" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
+                        <up-swipe-action-item  v-for="item in list" :name="item?.id" :key="item?.id" :disabled="item?.res !== '2'" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
                             <view @click.stop="clickItem(item)" class="b-radius bg-#fff pd-20 p-rtv">
                                 <view class="mb-10">
                                     <view class="c-#333 f-s-34 f-w-5 pb-5">{{ item?.gapBaseName }}</view>

src/plant/contact-unit/unit-list/index.vue

@@ -23,7 +23,7 @@
         <template>
             <view class="pd-24">
                 <up-swipe-action>
-                    <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :disabled="item?.storeCount" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
+                    <up-swipe-action-item  v-for="item in list" :name="item?.id" :key="item?.id" :disabled="item?.storeCount" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
                         <view @click.stop="clickItem(item)" class="b-radius bg-#fff pd-24 p-rtv base-shadow">
                             <view class="d-flex j-sb a-c li-item-head mb-16">
                                 <view class="li-left-tag">{{ selectDictLabel(pt_cus_type, item?.cusType) }}</view>

src/plant/packaging/list/index.vue

@@ -36,6 +36,7 @@
                                             showBatchInfo = true;
                                         "
                                         color="#18BECA"
+                                        :disabled="+item?.bgStatus"
                                         :customStyle="formItemBtnListStyle"
                                         >查看批次信息</up-button>
                                     <template v-if="item.refType == '2'">
@@ -44,7 +45,7 @@
                                     </template>
                                     <template v-if="item.refType == '1'">
                                         <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>
+                                        <up-button :customStyle="formItemBtnListStyle" :disabled="+item?.bgStatus" v-if="+item?.actualCount" @click="$u.route({ url: '/plant/packaging/detail/index', params: { id: item?.id, viewMode: 'relate' } })" class="ml-10" color="#91C747">查看关联记录</up-button>
                                     </template>
                                 </view>
                             </view>
@@ -53,7 +54,6 @@
                 </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>

src/plant/port/port-create/index.vue

@@ -754,7 +754,7 @@
                         <view class="b-radius border-#A3E5EA c-#18BECA bg-#FAFFFF w-100% d-flex j-c a-c h-100 f-s-34">从种源库快速添加</view>
                     </view>
                     <up-swipe-action>
-                        <up-swipe-action-item class="mb-20" v-for="(item, index) in animalIds" :key="index" :index="item" :name="item" :options="options1" @click="clickSwipe">
+                        <up-swipe-action-item  class="mb-20" v-for="(item, index) in animalIds" :key="index" :index="item" :name="item" :options="options1" @click="clickSwipe">
                             <view class="b-radius border-#37A954 c-#333 f-s-28 pd4-34-30-34-30">{{ item }}</view>
                         </up-swipe-action-item>
                     </up-swipe-action>