新购流程图

This commit is contained in:
bb_pan 2025-06-14 17:30:37 +08:00
parent 98268c53ba
commit 7b903edad3
9 changed files with 724 additions and 27 deletions

View File

@ -137,6 +137,12 @@
"navigationBarTitleText": "领料出库"
}
},
{
"path": "pages/picking/outbound/sign",
"style": {
"navigationBarTitleText": "电子签名"
}
},
// 2.
{
"path": "pages/picking/outbound/details",

View File

@ -61,6 +61,7 @@ onMounted(async () => {
uni.setStorageSync('username', loginForm.username)
uni.setStorageSync('password', loginForm.password)
uni.setStorageSync('id', res.user.userId)
uni.setStorageSync('deptName', res.user?.dept?.deptName)
setTimeout(() => {
uni.switchTab({
url: '/pages/index/index',
@ -87,6 +88,7 @@ const onHandleLogin = async () => {
uni.setStorageSync('username', loginForm.username)
uni.setStorageSync('password', loginForm.password)
uni.setStorageSync('id', result.user.userId)
uni.setStorageSync('deptName', result.user?.dept?.deptName)
setTimeout(() => {
uni.switchTab({
url: '/pages/index/index',

View File

@ -13,11 +13,11 @@
</uni-row>
<uni-row :gutter="24" class="sect-form">
<uni-section title="审核记录" type="line" padding>
<uni-steps :options="sectList" :active="activeSect" />
<uni-steps :options="auditingList" :active="activeSect" />
</uni-section>
</uni-row>
<uni-row :gutter="24" class="check-form">
<div style="display: flex; justify-content: space-between; align-items: center">
<uni-row :gutter="24" class="check-form" v-if="!isFinished">
<!-- <div style="display: flex; justify-content: space-between; align-items: center">
<checkbox-group @change="onAllChecked">
<checkbox
color="#409eff"
@ -27,9 +27,12 @@
/>
</checkbox-group>
<div>全选 {{ checkedCount }}/{{ tableList.length }}</div>
</div> -->
<div>
<button type="primary" size="mini" @click="handleAllSubmit(true)">合格</button>
</div>
<div>
<button type="primary" size="mini" @click="handleAllSubmit" :disabled="checkedCount == 0">批量合格</button>
<button type="warn" size="mini" @click="handleAllSubmit(false)">合格</button>
</div>
</uni-row>
<scroll-view scroll-y class="scroll-container">
@ -37,11 +40,10 @@
class="table-list-item"
v-for="(item, index) in tableList"
:key="index"
@click="handleItem(item)"
>
<div class="title">
<span>
<checkbox-group @change="onChangeChecked(item)">
<!-- <checkbox-group @change="onChangeChecked(item)">
<checkbox
color="#409eff"
borderColor="#409eff"
@ -49,7 +51,7 @@
:checked="item.isChecked"
:disabled="item.status != '2'"
/>
</checkbox-group>
</checkbox-group> -->
新购验收
</span>
<span :class="item.status == 2 ? 'pending' : 'completed'">
@ -97,16 +99,17 @@
<script setup>
import { ref, reactive, computed } from 'vue'
import { getPurchaseInfo, innerVerify } from '../../../services/purchase.js'
import { getPurchaseInfo, innerVerify, getSignListApi } from '../../../services/purchase.js'
import { onLoad, onShow } from '@dcloudio/uni-app'
const searchValue = ref('')
const id = ref('')
const taskId = ref('')
const isFinished = ref(false)
const statusList = ref(['2', '12'])
const tableList = ref([])
const allChecked = ref(false)
const sectList = ref([
{ title: '供应科审核', desc: '已审核\n张三\n' },
const auditingList = ref([
{ title: '供应科审核', desc: '' },
{ title: '技术科审核' },
{ title: '库管班审核' },
])
@ -114,6 +117,33 @@ const activeSect = ref(0)
const checkedCount = computed(
() => tableList.value.filter((item) => item.status == 2 && item.isChecked).length,
)
const getSignList = async () => {
try {
const res = await getSignListApi({ taskId: taskId.value })
if (res.code === 200 && res.data && res.data.length > 0) {
auditingList.value = res.data.map((item, index) => {
return {
...item,
title: item.deptName + '审核',
desc: item.auditStatusName + '\n' + (index == 0 ? '姚士超' : item.userName || '') + '\n' + item.createTime + '\n' + (item.auditRemark || '')
}
})
activeSect.value = auditingList.value.length - 1
const auditSteps = [
{ title: '技术科审核', desc: '待审核' },
{ title: '库管班审核', desc: '待审核' }
]
if (auditingList.value.length === 1) {
auditingList.value.push(...auditSteps)
} else if (auditingList.value.length === 2) {
auditingList.value.push(auditSteps[1])
}
}
} catch (error) {
console.log('🚀 ~ getSignList ~ error:', error)
}
}
const getTableList = () => {
let obj = {
id: id.value,
@ -174,28 +204,30 @@ const onAllChecked = () => {
console.log('🚀 ~ tableList.value.forEach ~ tableList.value:', tableList.value)
}
//
const handleAllSubmit = () => {
const handleAllSubmit = (bool) => {
console.log('🚀 ~ handleAllSubmit ~ bool:', bool)
const connect = bool ? '确定合格吗?' : '确定不合格吗?'
//
uni.showModal({
title: '提示',
content: '确定批量合格吗?',
content: connect,
success: async (res) => {
if (res.confirm) {
//
const checkedRows = tableList.value.filter(item => item.isChecked)
console.log('🚀 ~ success: ~ checkedRows:', checkedRows)
const purchaseCheckDetailsList = checkedRows.map(item => {
// const checkedRows = tableList.value.filter(item => item.isChecked)
// console.log('🚀 ~ success: ~ checkedRows:', checkedRows)
const purchaseCheckDetailsList = tableList.value.map(item => {
return {
taskId: item.taskId,
typeId: item.typeId,
status: '3',
checkResult: '合格',
status: bool ? '3' : '1',
checkResult: bool ? '合格' : '不合格',
manageType: item.manageType
}
})
const param = {
purchaseCheckDetailsList,
verifyPass: true
verifyPass: bool
}
console.log('🚀 ~ success: ~ param:', param)
try {
@ -207,6 +239,8 @@ const handleAllSubmit = () => {
})
allChecked.value = false
getTableList()
//
uni.navigateBack()
} catch (error) {
console.log('🚀 ~ success: ~ error:', error)
}
@ -218,7 +252,9 @@ onLoad((options) => {
console.log(options)
id.value = options.id
taskId.value = options.taskId
isFinished.value = options.isFinished ? JSON.parse(options.isFinished) : false
getTableList()
getSignList()
})
onShow(() => {
getTableList()

View File

@ -166,7 +166,21 @@ const onChangeDate = (val) => {
const maskClick = () => {}
const handleItem = (item) => {
console.log('🚀 ~ handleItem ~ item:', item)
uni.navigateTo({ url: `/pages/new-purchase/accept/acceptDetails?id=${item.id}&taskId=${item.taskId}` })
//
const isFinished = item.taskStatusName == '已完成'
const singLevel = {
'2': '技术科',
'3': '库管班',
}
const deptName = uni.getStorageSync('deptName')
if (!deptName.includes(singLevel[item.signLevel]) && !isFinished) {
uni.showToast({
title: `请联系${singLevel[item.signLevel]}进行审核`,
icon: 'none',
})
return
}
uni.navigateTo({ url: `/pages/new-purchase/accept/acceptDetails?id=${item.id}&taskId=${item.taskId}&isFinished=${isFinished}` })
}
onShow((options) => {
getTableList(true)

View File

@ -135,16 +135,17 @@ const queryParams = ref({
statusList: [3], //
pageNum: 1,
pageSize: 3,
hasSign: 1,
})
const options = reactive([
{
text: '电子签名',
style: {
backgroundColor: '#3784fb',
fontSize: '28rpx',
},
},
// {
// text: '',
// style: {
// backgroundColor: '#3784fb',
// fontSize: '28rpx',
// },
// },
])
//

View File

@ -0,0 +1,624 @@
<template>
<!-- 领料出库 -->
<view class="page-container">
<uni-row :gutter="24" class="search-form">
<uni-col :span="24">
<view>
<uni-datetime-picker
v-model="dateArray"
type="daterange"
@maskClick="maskClick"
@change="onChangeDate"
placeholder="选择日期范围"
style="width: 100%"
/>
</view>
</uni-col>
</uni-row>
<uni-row :gutter="24" class="search-form">
<uni-col :span="18">
<view>
<uni-easyinput placeholder="请输入内容" v-model="queryParams.keyWord" />
</view>
</uni-col>
<uni-col :span="6">
<view class="search" @click="getTableList(false, true)">搜索</view>
</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>
<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 ? '没有更多数据了~' : '正在加载...' }}
</view>
</scroll-view>
</view>
</template>
<script setup>
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'
const total = ref(0) //
const active = ref(1) // tap
const tableList = ref([]) //
const dateArray = ref([]) //
//
const queryParams = ref({
startTime: '', //
endTime: '', //
keyWord: '', //
pageNum: 1,
pageSize: 10,
hasSign: 0,
})
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
queryParams.value.startTime = val_1
queryParams.value.endTime = val_2
}
//
const getTableList = async (isTap = false, isSearch = false) => {
if (isSearch) {
//
queryParams.value.pageNum = 1
tableList.value = []
}
console.log('queryParams.value查询参数', queryParams.value)
const res = await getPickingOutboundListAPI(queryParams.value)
console.log('res列表数据', res)
total.value = res.data.total
if (isTap) {
tableList.value = res.data.rows
} else {
if (res.data.rows.length == 0) {
tableList.value = []
} else {
// tableList.value = res.data.rows
tableList.value = [...tableList.value, ...res.data.rows]
}
}
}
// //
// onLoad(() => {
// getTableList()
// })
onShow(() => {
queryParams.value.pageNum = 1
tableList.value = []
total.value = 0
getTableList()
})
//
const onScrollTolower = debounce(() => {
console.log('触底事件')
if (total.value > tableList.value.length) {
queryParams.value.pageNum++
getTableList()
}
}, 500)
// tap
const changeTab = (index) => {
active.value = index
console.log('index', index)
if (index == 2) {
queryParams.value.statusList = [4] //
queryParams.value.pageNum = 1
getTableList(true)
} else if (index == 1) {
queryParams.value.statusList = [3] //
queryParams.value.pageNum = 1
getTableList(true)
}
}
//
const handleItem = (item) => {
uni.navigateTo({
url: `/pages/picking/outbound/details?id=${item.id}&publishTask=${item.publishTask}`,
})
}
//
const finish = computed(() => {
console.log('xxxxxxxxxxxx', total.value, tableList.value.length)
if (total.value === tableList.value.length) return true
})
const maskClick = () => {}
//
const successStyle = {
color: '#52c41a',
backgroundColor: 'rgba(82, 196, 26, 0.1)',
border: '2rpx solid rgba(82, 196, 26, 0.2)',
fontWeight: '600',
}
</script>
<style lang="scss" scoped>
.page-container {
display: flex;
height: 100vh;
flex-direction: column;
background-color: #f7f8fa;
padding: 24rpx;
// Tab
.complete-btn {
display: flex;
padding: 20rpx 24rpx;
justify-content: center;
background: #fff;
border-radius: 20rpx;
margin-bottom: 20rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
.btn {
display: flex;
flex-direction: column;
align-items: center;
padding: 0 60rpx;
position: relative;
transition: all 0.3s ease;
span {
font-size: 32rpx;
color: #8c8c8c;
font-weight: 500;
&.active {
color: #3784fb;
font-weight: 600;
.second-active & {
color: #fa8c16;
}
}
}
.bt-line {
width: 32rpx;
height: 6rpx;
background: #3784fb;
margin-top: 12rpx;
border-radius: 6rpx;
transition: all 0.3s ease;
.second-active & {
background: #fa8c16;
}
}
}
}
//
.search-form {
display: flex;
align-items: center;
background: #fff;
padding: 24rpx;
border-radius: 20rpx;
margin-bottom: 24rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
:deep(.uni-date) {
width: 100%;
.uni-date-x {
width: 100%;
}
.uni-date-editor--x {
width: 100%;
}
.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;
}
}
}
.uni-date-x--border {
width: 100%;
border: 2rpx solid #e8e8e8;
border-radius: 12rpx;
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);
}
}
}
.search {
width: 100%;
height: 80rpx;
background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
text-align: center;
line-height: 80rpx;
color: #fff;
border-radius: 12rpx;
font-size: 28rpx;
font-weight: 600;
box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
transition: all 0.3s ease;
&:active {
transform: translateY(2rpx);
opacity: 0.9;
}
}
}
//
.table-list-item {
margin: 24rpx 0;
padding: 32rpx;
background-color: #fff;
border-radius: 20rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
transition: all 0.3s ease;
&:active {
transform: scale(0.985);
background-color: #fafbfc;
}
.title {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 24rpx;
.code {
font-size: 32rpx;
font-weight: 600;
color: #007aff;
letter-spacing: 1rpx;
background: linear-gradient(90deg, #007aff, #4b8eff);
-webkit-background-clip: text;
color: transparent;
}
.cont {
:deep(.uni-tag) {
padding: 6rpx 20rpx;
border-radius: 8rpx;
font-size: 26rpx;
font-weight: 600;
border: none;
transition: all 0.3s ease;
&[type='warning'] {
background-color: rgba(250, 140, 22, 0.1);
color: #fa8c16;
border: 2rpx solid rgba(250, 140, 22, 0.2);
}
&[type='success'] {
// custom-style
}
&:active {
opacity: 0.8;
transform: scale(0.98);
}
}
}
}
.line {
margin: 24rpx 0;
height: 2rpx;
background: linear-gradient(
90deg,
rgba(232, 232, 232, 0) 0%,
rgba(232, 232, 232, 1) 50%,
rgba(232, 232, 232, 0) 100%
);
}
:deep(.uni-row) {
margin-bottom: 20rpx;
.uni-col-7 {
color: #8c8c8c;
font-size: 28rpx;
font-weight: 500;
}
.cont {
display: flex;
justify-content: flex-end;
line-height: 1.8;
color: #262626;
font-size: 28rpx;
font-weight: 500;
}
}
//
: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;
display: flex;
align-items: center;
justify-content: center;
font-size: 28rpx;
font-weight: 600;
color: #fff;
&:nth-child(1) {
background: linear-gradient(to bottom, #3ad980, #34c759);
}
&:nth-child(2) {
background: linear-gradient(to bottom, #3b95ff, #007aff);
}
}
}
}
}
.scroll-container {
padding: 0 2rpx;
.table-list-item {
margin: 24rpx 0;
padding: 32rpx;
background-color: #fff;
min-height: 300rpx;
border-radius: 20rpx;
box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
transition: all 0.3s ease;
&:active {
transform: scale(0.985);
background-color: #fafbfc;
}
.title {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20rpx;
.title-left {
.code {
font-size: 32rpx;
font-weight: 600;
color: #3784fb;
letter-spacing: 1rpx;
}
}
span.status {
padding: 8rpx 28rpx;
border-radius: 8rpx;
font-size: 26rpx;
font-weight: 600;
&.completed {
background-color: rgba(82, 196, 26, 0.1);
color: #52c41a;
}
&.pending {
background-color: rgba(250, 140, 22, 0.1);
color: #fa8c16;
}
}
}
.line {
margin: 24rpx 0;
height: 2rpx;
background: linear-gradient(
90deg,
rgba(232, 232, 232, 0) 0%,
rgba(232, 232, 232, 1) 50%,
rgba(232, 232, 232, 0) 100%
);
}
:deep(.uni-row) {
margin-bottom: 20rpx;
.uni-col-6 {
color: #8c8c8c;
font-size: 28rpx;
font-weight: 500;
}
}
.cont {
display: flex;
justify-content: flex-end;
line-height: 1.8;
color: #262626;
font-size: 28rpx;
font-weight: 500;
}
}
}
//
.loading-text {
text-align: center;
font-size: 26rpx;
color: #8c8c8c;
padding: 32rpx 0;
letter-spacing: 1rpx;
}
}
//
: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 {
writing-mode: vertical-rl;
padding: 0 24rpx;
font-size: 28rpx !important;
font-weight: 600;
//
&:nth-child(1) {
background: linear-gradient(to bottom, #3ad980, #34c759) !important;
}
//
&:nth-child(2) {
background: linear-gradient(to bottom, #3b95ff, #007aff) !important;
}
&:active {
opacity: 0.85;
}
}
}
}
</style>

View File

@ -174,6 +174,11 @@ const newPurchaseList = ref([
//
const pickingList = ref([
{
title: '电子签名',
url: '/pages/picking/outbound/sign',
iconSrc: '../../static/workbench/backCreate.png',
},
{
title: '领料出库',
url: '/pages/picking/outbound/index',

View File

@ -72,3 +72,12 @@ export const getMachineCode = (data)=> {
data: data,
})
}
// 流程图
export function getSignListApi(data) {
return http({
url: '/material/purchase_check_info/getSignList',
method: 'get',
data
})
}

View File

@ -10,7 +10,7 @@ const ENV = process.env.NODE_ENV
// export const baseURL = ENV === 'development' ? 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/' : 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/'//生产
export const baseURL = ENV === 'development' ? '/api' : '/iws/jiju-api'; // 宏源服务
// export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***'
// export const baseURL = ENV === 'development' ? 'http://192.168.2.27:18080' : 'http://192.168.2.27:18080'//马
// export const baseURL = ENV === 'development' ? 'http://192.168.0.96:18080' : 'http://192.168.2.27:18080'//马
// export const baseURL = ENV === 'development' ? '/api' : '***'
// **********OCR识别为NVUE文件页面请求URL需要同步配置**********