领料退料电子签名

src/pages/back/index.vue

@@ -40,6 +40,7 @@
         </uni-row>
         <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
             <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
+                <uni-swipe-action>
                     <uni-swipe-action-item :right-options="item.taskStatus==0 ? options:options2" @click="onClick($event,item)"  @change="onSwipeChange">
                         <div class="title">
                             <span class="code">{{ item.code }}</span>
@@ -107,6 +108,7 @@
                             >
                         </uni-row> 
                     </uni-swipe-action-item>
+                </uni-swipe-action>
             </div>
             <view class="loading-text">
                 {{ finish ? '没有更多数据了~' : '正在加载...' }}
@@ -136,6 +138,14 @@ const queryParams = ref({
 
 // 右滑按钮组-未完成
 const options = ref([
+    {
+        text: '电子签名',
+        style: {
+            backgroundColor: '#65a1ff',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
     {
         text: '提交',
         style: {
@@ -156,13 +166,21 @@ const options = ref([
 // 右滑按钮组-已完成
 const options2 = ref([
     {
-        text: '查看',
+        text: '电子签名',
         style: {
             backgroundColor: '#65a1ff',
             color: '#fff',
             fontSize: '30rpx',
         },
     },
+    {
+        text: '查看',
+        style: {
+            backgroundColor: '#65a1ff !important',
+            color: '#fff',
+            fontSize: '30rpx',
+        },
+    },
     // {
     //     text: '删除',
     //     style: {
@@ -174,9 +192,21 @@ const options2 = ref([
 ])  
 //点击事件
 const onClick=(e,item)=> {
+    console.log('🚀 ~ onClick ~ item:', item)
     const { index } = e
     console.log(index)
     if (index === 0) {
+        const params = {
+            id: item.id,
+            backSignUrl: item.backSignUrl,
+            backSignType: item.backSignType,
+            isBack: true
+        }
+        uni.navigateTo({
+            url: `/pages/my/signature?params=${JSON.stringify(params)}`,
+        })
+    }
+    if (index === 1) {
         if (item.taskStatus == 0) {//未完成-提交
             console.log(item)
             let param = {
@@ -200,7 +230,7 @@ const onClick=(e,item)=> {
         }
     }
     // 2. 删除
-    if (index === 1) {
+    if (index === 2) {
         console.log(item)
             let param = {
                 id:item.id
@@ -524,13 +554,13 @@ const warningStyle = {
                 font-size: 28rpx;
                 font-weight: 600;
 
-                &:nth-child(1) {
+                /* &:nth-child(1) {
                     background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
                 }
 
                 &:nth-child(2) {
                     background: linear-gradient(135deg, #ff4d4f 0%, #ed6042 100%);
-                }
+                } */
             }
         }
     }

src/pages/my/signature.vue

@@ -1,7 +1,7 @@
 <template>
     <view>
-        <div class="img" :class="{ rotate: isRotate }" v-if="imgPath">
+        <div class="img" v-if="imgPath">
-            <image :src="imgPath" @click="preview"></image>
+            <image :class="{ rotate: isRotate }" :src="imgPath" @click="preview"></image>
         </div>
         <div class="img" v-else>暂无数据</div>
         <div class="tips">
@@ -17,7 +17,13 @@
 
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
-import { getSign, updateSign } from '@/services/signature.js'
+import { onLoad } from '@dcloudio/uni-app'
+import {
+    getSign,
+    updateSign,
+    updateLeaseApplyInfoSign,
+    updateSignById,
+} from '@/services/signature.js'
 import { baseURL } from '@/utils/http'
 
 let isCanvas = ref(false)
@@ -25,8 +31,30 @@ let imgPath = ref('')
 let isRotate = ref(false)
 let actionUrl = `${baseURL}/file/upload`
 let signType = ref(0)
+const opts = reactive({})
+
+onLoad((opt) => {
+    // console.log('🚀 ~ onLoad ~ opt:', opt)
+    Object.assign(opts, JSON.parse(opt.params))
+    if (opts.isLease) {
+        signType.value = opts.leaseSignType
+        imgPath.value = opts.leaseSignUrl
+    }
+    if (opts.isBack) {
+        signType.value = opts.backSignType
+        imgPath.value = opts.backSignUrl
+    }
+    if (signType.value == 1) {
+        isRotate.value = false
+    } else {
+        isRotate.value = true
+    }
+    console.log('🚀 ~ onLoad ~ opts:', opts)
+    console.log('🚀 ~ onLoad ~ signType:', signType.value)
+})
 
 onMounted(() => {
+    if (opts.isLease || opts.isBack) return
     getSignData()
 })
 // 获取签名
@@ -62,9 +90,9 @@ const open = () => {
 // 预览
 const preview = () => {
     console.log('预览', imgPath.value)
-    uni.previewImage({
+    // uni.previewImage({
-        urls: [imgPath.value],
+    //     urls: [imgPath.value],
-    })
+    // })
 }
 // 拍照/上传
 const handlePhoto = () => {
@@ -91,21 +119,46 @@ const uploadImg = (path) => {
         header: {
             // Authorization: this.token,
         },
-        success: (res) => {
+        success: async (res) => {
             console.log('🚀 ~ uploadImg ~ res:', res)
-            // imgPath.value = JSON.parse(res.data).data.url
+            try {
+                const signUrl = JSON.parse(res.data).data.url
+                if (opts.isLease) {
                     const params = {
-                signUrl: JSON.parse(res.data).data.url,
+                        id: opts.id,
+                        leaseSignUrl: signUrl,
+                        leaseSignType: signType.value,
+                    }
+                    console.log('🚀 ~ success: ~ params:', params)
+                    const res = await updateLeaseApplyInfoSign(params)
+                    console.log('🚀 ~ uploadImg-领料 ~ res:', res)
+                    uni.navigateBack()
+                } else if (opts.isBack) {
+                    const params = {
+                        id: opts.id,
+                        backSignUrl: signUrl,
+                        backSignType: signType.value,
+                    }
+                    console.log('🚀 ~ success: ~ params:', params)
+                    const res = await updateSignById(params)
+                    console.log('🚀 ~ uploadImg-退料 ~ res:', res)
+                    uni.navigateBack()
+                } else {
+                    const params = {
+                        signUrl: signUrl,
                         signType: signType.value,
                     }
-            updateSign(params)
+                    const res = await updateSign(params)
-                .then((res) => {
+                    console.log('🚀 ~ uploadImg-个人中心 ~ res:', res)
-                    console.log('🚀 ~ .then ~ res:', res)
                     getSignData()
+                }
+            } catch (error) {
+                console.log('🚀 ~ uploadImg ~ error:', error)
+                uni.showToast({
+                    title: '上传失败',
+                    icon: 'none',
                 })
-                .catch((err) => {
+            }
-                    console.log('🚀 ~ .then ~ err:', err)
-                })
         },
         fail: (err) => {
             console.log('🚀 ~ uploadImg ~ err:', err)

src/pages/picking/outbound/index.vue

@@ -20,7 +20,7 @@
                         @maskClick="maskClick"
                         @change="onChangeDate"
                         placeholder="选择日期范围"
-                        style="width: 100%;"
+                        style="width: 100%"
                     />
                 </view>
             </uni-col>
@@ -36,13 +36,17 @@
             </uni-col>
         </uni-row>
 
-
         <scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
             <view
                 class="table-list-item"
                 :key="index"
                 @click="handleItem(item)"
                 v-for="(item, index) in tableList"
+            >
+                <uni-swipe-action class="swipe-action">
+                    <uni-swipe-action-item
+                        :right-options="options"
+                        @click="onSignature($event, item)"
                     >
                         <div class="title">
                             <span class="code">{{ item.code }}</span>
@@ -103,6 +107,8 @@
                                 <div class="cont">{{ item.preCountNum - item.alNum }}</div>
                             </uni-col>
                         </uni-row>
+                    </uni-swipe-action-item>
+                </uni-swipe-action>
             </view>
             <view class="loading-text">
                 {{ finish ? '没有更多数据了~' : '正在加载...' }}
@@ -112,11 +118,11 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, reactive, computed } from 'vue'
 import { getPickingOutboundListAPI } from '@/services/picking/outbound.js'
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import { debounce } from 'lodash-es'
-import { onBackPress } from '@dcloudio/uni-app';
+import { onBackPress } from '@dcloudio/uni-app'
 const total = ref(0) //                 数据总量
 const active = ref(1) //                tap索引
 const tableList = ref([]) //            列表数据源
@@ -131,6 +137,31 @@ const queryParams = ref({
     pageSize: 3,
 })
 
+const options = reactive([
+    {
+        text: '电子签名',
+        style: {
+            backgroundColor: '#3784fb',
+            fontSize: '28rpx',
+        },
+    },
+])
+
+// 电子签名
+const onSignature = (e, item) => {
+    console.log('电子签名-e', e)
+    console.log('电子签名-item', item)
+    const params = {
+        id: item.id,
+        leaseSignUrl: item.leaseSignUrl,
+        leaseSignType: item.leaseSignType,
+        isLease: true,
+    }
+    uni.navigateTo({
+        url: `/pages/my/signature?params=${JSON.stringify(params)}`,
+    })
+}
+
 // 日期 change 事件
 const onChangeDate = (val) => {
     const [val_1, val_2] = val
@@ -206,7 +237,7 @@ const successStyle = {
     color: '#52c41a',
     backgroundColor: 'rgba(82, 196, 26, 0.1)',
     border: '2rpx solid rgba(82, 196, 26, 0.2)',
-    fontWeight: '600'
+    fontWeight: '600',
 }
 </script>
 
@@ -238,7 +269,7 @@ const successStyle = {
                 transition: all 0.3s ease;
 
                 &.active {
-                    color: #007AFF;
+                    color: #007aff;
                     font-weight: 600;
                 }
             }
@@ -250,7 +281,7 @@ const successStyle = {
                 transform: translateX(-50%);
                 width: 56rpx;
                 height: 6rpx;
-                background: linear-gradient(90deg, #007AFF, #4b8eff);
+                background: linear-gradient(90deg, #007aff, #4b8eff);
                 border-radius: 6rpx;
             }
         }
@@ -352,9 +383,9 @@ const successStyle = {
             .code {
                 font-size: 32rpx;
                 font-weight: 600;
-                color: #007AFF;
+                color: #007aff;
                 letter-spacing: 1rpx;
-                background: linear-gradient(90deg, #007AFF, #4b8eff);
+                background: linear-gradient(90deg, #007aff, #4b8eff);
                 -webkit-background-clip: text;
                 color: transparent;
             }
@@ -368,13 +399,13 @@ const successStyle = {
                     border: none;
                     transition: all 0.3s ease;
 
-                    &[type="warning"] {
+                    &[type='warning'] {
                         background-color: rgba(250, 140, 22, 0.1);
                         color: #fa8c16;
                         border: 2rpx solid rgba(250, 140, 22, 0.2);
                     }
 
-                    &[type="success"] {
+                    &[type='success'] {
                         // 样式将通过 custom-style 控制
                     }
 
@@ -389,7 +420,8 @@ const successStyle = {
         .line {
             margin: 24rpx 0;
             height: 2rpx;
-            background: linear-gradient(90deg, 
+            background: linear-gradient(
+                90deg,
                 rgba(232, 232, 232, 0) 0%,
                 rgba(232, 232, 232, 1) 50%,
                 rgba(232, 232, 232, 0) 100%
@@ -440,11 +472,11 @@ const successStyle = {
                     color: #fff;
 
                     &:nth-child(1) {
-                        background: linear-gradient(to bottom, #3ad980, #34C759);
+                        background: linear-gradient(to bottom, #3ad980, #34c759);
                     }
 
                     &:nth-child(2) {
-                        background: linear-gradient(to bottom, #3b95ff, #007AFF);
+                        background: linear-gradient(to bottom, #3b95ff, #007aff);
                     }
                 }
             }

src/services/signature.js

@@ -17,3 +17,21 @@ export const updateSign = (data) => {
         data,
     })
 }
+
+// 签名-领料
+export const updateLeaseApplyInfoSign = (data) => {
+    return http({
+        method: 'POST',
+        url: '/material/lease_apply_info/updateLeaseApplyInfoSign',
+        data,
+    })
+}
+
+// 签名-退料
+export const updateSignById = (data) => {
+    return http({
+        method: 'POST',
+        url: '/material/back_apply_info/updateSignById',
+        data,
+    })
+}