领料退料电子签名

This commit is contained in:
binbin_pan 2025-01-09 15:14:30 +08:00
parent 64c336db01
commit b945f4eec9
4 changed files with 309 additions and 176 deletions

View File

@ -40,73 +40,75 @@
</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-item :right-options="item.taskStatus==0 ? options:options2" @click="onClick($event,item)" @change="onSwipeChange">
<div class="title">
<span class="code">{{ item.code }}</span>
<div class="status-tag">
<uni-tag
:text="active == 1 ? '已完成' : '未完成'"
:type="active == 1 ? 'success' : 'warning'"
:custom-style="active == 1 ? successStyle : warningStyle"
/>
<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>
<div class="status-tag">
<uni-tag
:text="active == 1 ? '已完成' : '未完成'"
:type="active == 1 ? 'success' : 'warning'"
:custom-style="active == 1 ? successStyle : warningStyle"
/>
</div>
</div>
</div>
<div class="line"></div>
<uni-row :gutter="24">
<uni-col :span="8">申请时间</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.createTime }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料单号</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.code }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料物资</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.typeName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料单位</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.unitName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">工程名称</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.proName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料人</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.backPerson }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">联系电话</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.phone }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">已退数量</uni-col>
<uni-col :span="16"
><div class="cont">{{ }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">备注</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.remark }}</div></uni-col
>
</uni-row>
</uni-swipe-action-item>
<div class="line"></div>
<uni-row :gutter="24">
<uni-col :span="8">申请时间</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.createTime }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料单号</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.code }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料物资</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.typeName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料单位</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.unitName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">工程名称</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.proName }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">退料人</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.backPerson }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">联系电话</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.phone }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">已退数量</uni-col>
<uni-col :span="16"
><div class="cont">{{ }}</div></uni-col
>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="8">备注</uni-col>
<uni-col :span="16"
><div class="cont">{{ item.remark }}</div></uni-col
>
</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: {
@ -155,14 +165,22 @@ 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%);
}
} */
}
}
}

View File

@ -1,7 +1,7 @@
<template>
<view>
<div class="img" :class="{ rotate: isRotate }" v-if="imgPath">
<image :src="imgPath" @click="preview"></image>
<div class="img" v-if="imgPath">
<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({
urls: [imgPath.value],
})
// uni.previewImage({
// 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
const params = {
signUrl: JSON.parse(res.data).data.url,
signType: signType.value,
}
updateSign(params)
.then((res) => {
console.log('🚀 ~ .then ~ res:', res)
try {
const signUrl = JSON.parse(res.data).data.url
if (opts.isLease) {
const params = {
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,
}
const res = await updateSign(params)
console.log('🚀 ~ uploadImg-个人中心 ~ 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)

View File

@ -2,7 +2,7 @@
<!-- 领料出库 -->
<view class="page-container">
<view class="complete-btn">
<view class="btn" @click="changeTab(1)">
<view class="btn" @click="changeTab(1)">
<span>未完成</span>
<div v-if="active == 1" class="bt-line"></div>
</view>
@ -20,12 +20,12 @@
@maskClick="maskClick"
@change="onChangeDate"
placeholder="选择日期范围"
style="width: 100%;"
style="width: 100%"
/>
</view>
</uni-col>
</uni-col>
</uni-row>
<uni-row :gutter="24" class="search-form">
<uni-row :gutter="24" class="search-form">
<uni-col :span="18">
<view>
<uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
@ -36,7 +36,6 @@
</uni-col>
</uni-row>
<scroll-view scroll-y @scrolltolower="onScrollTolower" class="scroll-container">
<view
class="table-list-item"
@ -44,65 +43,72 @@
@click="handleItem(item)"
v-for="(item, index) in tableList"
>
<div class="title">
<span class="code">{{ item.code }}</span>
<div class="cont">
<uni-tag
:text="item.taskStatus === 3 ? '未完成' : '已完成'"
:type="item.taskStatus === 3 ? 'warning' : 'success'"
:custom-style="item.taskStatus === 4 ? successStyle : ''"
/>
</div>
</div>
<div class="line"></div>
<uni-row :gutter="24">
<uni-col :span="6">申请时间</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.createTime }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料物资</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.maTypeNames }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料单位</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leaseUnit }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料工程</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leaseProject }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料人</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leasePerson }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">预领数量</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.preCountNum }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">已领数量</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.alNum }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">待领数量</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.preCountNum - item.alNum }}</div>
</uni-col>
</uni-row>
<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>
<div class="cont">
<uni-tag
:text="item.taskStatus === 3 ? '未完成' : '已完成'"
:type="item.taskStatus === 3 ? 'warning' : 'success'"
:custom-style="item.taskStatus === 4 ? successStyle : ''"
/>
</div>
</div>
<div class="line"></div>
<uni-row :gutter="24">
<uni-col :span="6">申请时间</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.createTime }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料物资</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.maTypeNames }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料单位</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leaseUnit }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料工程</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leaseProject }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料人</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.leasePerson }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">预领数量</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.preCountNum }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">已领数量</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.alNum }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">待领数量</uni-col>
<uni-col :span="18">
<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>
@ -231,14 +262,14 @@ const successStyle = {
padding: 8rpx 0;
min-width: 140rpx;
text-align: center;
span {
font-size: 32rpx;
color: #8c8c8c;
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;
}
}
@ -279,14 +310,14 @@ const successStyle = {
.uni-date-range--x {
width: 100%;
.uni-date-range--x-input {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24rpx;
.uni-date-range--x-text {
font-size: 28rpx;
color: #262626;
@ -301,7 +332,7 @@ const successStyle = {
background-color: #f7f8fa;
height: 80rpx;
transition: all 0.3s ease;
&:focus-within {
border-color: #3784fb;
box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
@ -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%
@ -398,7 +430,7 @@ const successStyle = {
:deep(.uni-row) {
margin-bottom: 20rpx;
.uni-col-7 {
color: #8c8c8c;
font-size: 28rpx;
@ -419,16 +451,16 @@ const successStyle = {
:deep(.uni-swipe_action) {
border-radius: 20rpx;
overflow: hidden;
.uni-swipe_content {
margin: 0 !important;
padding: 0;
background-color: #fff;
}
.uni-swipe_button-group {
height: 100%;
.uni-swipe_button {
height: 100%;
padding: 0 40rpx;
@ -438,13 +470,13 @@ const successStyle = {
font-size: 28rpx;
font-weight: 600;
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);
}
}
}

View File

@ -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,
})
}