领料出库和直转审核

This commit is contained in:
hongchao 2025-08-31 11:04:10 +08:00
parent 1228bebe04
commit ebea242f13
6 changed files with 1760 additions and 4 deletions

View File

@ -733,6 +733,23 @@
"navigationBarTitleText": "在用查询"
}
},
//
{
"path": "pages/businessAudit/directAudit/index",
"style": {
"navigationBarTitleText": "直转审核"
}
},
{
"path": "pages/businessAudit/directAudit/details",
"style": {
"navigationBarTitleText": "直转申请详情"
}
},
//
{
"path": "pages/repair/fieldMaintenance/index",

View File

@ -0,0 +1,900 @@
<template>
<!-- 编码出库-->
<view class="page-container">
<text class="steps-title">直转申请详情</text>
<!-- <uni-steps
:options="auditingList.map(item => ({ title: item.nodeName,desc: `${item.isAccept == 0 ? '待审批' : item.isAccept == 1 ? '已通过' : '已驳回'}${item.createTime ? ` ${item.createTime}` : ''}` ,
status: 'finish',
}))" style="margin-bottom: 5px;"
:active="3" >
</uni-steps> -->
<!-- 自定义横向步骤条 -->
<view class="custom-steps vertical">
<view
v-for="(item, index) in auditingList"
:key="index"
class="step-item"
>
<!-- 步骤图标 -->
<view
class="step-icon"
:class="{
'pending': item.isAccept === 0,
'approved': item.isAccept === 1,
'rejected': item.isAccept !== 0 && item.isAccept !== 1
}"
>
{{ index + 1 }}
</view>
<!-- 步骤连接线 -->
<view
v-if="index < auditingList.length - 1"
class="step-line"
:class="{
'approved': item.isAccept === 1,
'rejected': item.isAccept !== 0 && item.isAccept !== 1
}"
></view>
<!-- 步骤标题和描述 -->
<view class="step-content">
<text
class="step-title"
:class="{
'pending': item.isAccept === 0,
'approved': item.isAccept === 1,
'rejected': item.isAccept !== 0 && item.isAccept !== 1
}"
>
{{ item.nodeName }}
</text>
<div style="margin-left: 40px;margin-top:10px">
<text
class="step-desc"
>
审批结果<text class="step-desc" :class="{
'pending': item.isAccept === 0,
'approved': item.isAccept === 1,
'rejected': item.isAccept !== 0 && item.isAccept !== 1
}">{{ item.isAccept == 0 ? '待审批' : item.isAccept == 1 ? '已通过' : '已驳回' }}</text><br/>
审批人<text class="black-text">{{ item.auditBy ? item.auditBy : '' }}</text><br/>
审批时间<text class="black-text">{{ item.createTime ? item.createTime : '' }}</text><br/>
审批意见<text class="black-text">{{ '' }}</text>
</text>
</div>
</view>
</view>
</view>
<!-- 按钮区域 -->
<view class="table-list-item" v-if="type==1 && auditStatus==0">
<uni-row :gutter="24" style="display: flex; align-items: center" justify="center">
<uni-col :span="8">
<view
class="coding-btn search-btn"
@tap="handleReview(1)"
>通过</view>
</uni-col>
<uni-col :span="8">
<view
class="coding-btn search-btnTwo"
@tap="handleReview(2)"
>驳回</view>
</uni-col>
</uni-row>
</view>
<!-- 表单信息区域 -->
<scroll-view scroll-y style="height: 100vh;margin-top: 5px">
<view class="form-section">
<view class="section-header" @tap="toggleForm">
<text class="title">基本信息</text>
<text class="toggle-icon" :class="{ 'is-expanded': isExpanded }"></text>
</view>
<view class="form-content" :class="{ 'is-expanded': isExpanded }">
<uni-forms :model="formData" label-width="100" :border="true">
<uni-forms-item label="领料单位:" name="leaseUnit">
<span class="form-view">{{ formData.leaseUnit }}</span>
</uni-forms-item>
<uni-forms-item label="领料工程:" name="leaseProject">
<span class="form-view">{{ formData.leaseProject }}</span>
</uni-forms-item>
<uni-forms-item label="领料人:" name="leasePerson">
<span class="form-view">{{ formData.leasePerson }}</span>
</uni-forms-item>
<!-- <uni-forms-item label="采购申请编号:" name="applyCode">
<span class="form-view">{{ formData.applyCode }}</span>
</uni-forms-item> -->
<uni-forms-item label="标准配置:" name="leaseUnit">
<span class="form-view">{{ formData.leaseUnit }}</span>
</uni-forms-item>
<uni-forms-item label="联系电话:" name="phone">
<span class="form-view">{{ formData.phone }}</span>
</uni-forms-item>
<uni-forms-item label="类型规格:" name="maTypeNames">
<span class="form-view">{{ formData.maTypeNames }}</span>
</uni-forms-item>
</uni-forms>
</view>
</view>
<scroll-view scroll-y @scrolltolower="onScrollTolower" style="padding-bottom: 90rpx">
<div style="width: 92%;height: auto;margin: 5px;">
<uni-table stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th width="60px" style="font-size: 24rpx;" align="center">序号</uni-th>
<uni-th width="100px" style="font-size: 24rpx;" align="center">类型名称</uni-th>
<uni-th width="100px" style="font-size: 24rpx;" align="center">规格型号</uni-th>
<uni-th width="70px" style="font-size: 24rpx;" align="center">计量单位</uni-th>
<uni-th width="100px" style="font-size: 24rpx;" align="center">预领数量</uni-th>
<uni-th width="60px" style="font-size: 24rpx;" align="center">备注</uni-th>
</uni-tr>
<!-- 表格数据行 -->
<uni-tr v-for="(item,index) in codeDeviceList" :key="item.id">
<uni-td style="font-size: 24rpx;text-align: center;">{{ index + 1 }}</uni-td>
<uni-td style="font-size: 24rpx;text-align: center;">{{item.maTypeName}}</uni-td>
<uni-td style="font-size: 24rpx;text-align: center;">{{item.typeName}}</uni-td>
<uni-td style="font-size: 24rpx;text-align: center;">{{item.unitName}}</uni-td>
<uni-td style="font-size: 24rpx;text-align: center;">{{item.preNum}}</uni-td>
<uni-td style="font-size: 24rpx;text-align: center;">{{item.remark}}</uni-td>
</uni-tr>
</uni-table>
</div>
<!--
<view class="loading-text">
{{ finish ? '没有更多数据了~' : '正在加载...' }}
</view> -->
</scroll-view>
</scroll-view>
</view>
</template>
<script setup>
import { ref, computed, onUnmounted } from 'vue'
import { onLoad, onShow, } from '@dcloudio/uni-app'
import { getCodeDeviceListAPI, setOutboundNumAPI, } from '@/services/picking/outbound.js'
import { getAuditInfoAPI,receiveDetailAPI,submitAuditingApi,getNodeAuditStatusAPI } from '@/services/picking/review.js'
import { appLoginAPI, getUserInfoAPI, iwsLoginAPI,getConfigApi } from '@/services/index.js'
import { debounce } from 'lodash-es'
import { useMemberStore } from '@/stores'
const memberStore = useMemberStore()
// const query = defineProps() //
// const queryParams = JSON.parse(query.queryParams)
const queryParams = ref({
id: '', //id
nodeId: '', //id
})
const queryParamsInfo = ref({})
const formData = ref({})
const codeDeviceList = ref([])
const total = ref(0)
const auditStatus = ref('')
//
const queryCodeParams = ref({
pageNum: 1,
pageSize: 10,
typeId: '',
maStatus: 1,
maCode: '',
})
const auditingParams = ref({
nodeId: '', // id
remark: '', //
typeId: '', // typeId
taskId: '', // taskId
isAccept: '', // 1. 2.
recordId: '',
nextNodeId: '', // ID
leaseId: '', // id
taskCode: '', //
unitName: '', //
projectName: '', //
})
const auditingList = ref([]) //
//
const isExpanded = ref(true)
//
const toggleForm = () => {
isExpanded.value = !isExpanded.value
}
const type = ref(1)
const userId = ref(uni.getStorageSync('id') || '')
const origin = window.location.href
onLoad(async(options) => {
getConfig()
if (origin.indexOf('params') != -1) {
queryParams.value = JSON.parse(options.params)
auditingParams.value.taskId = queryParams.value.taskId
type.value = queryParams.value.type
//
initPageData();
} else { //
const urlParams = new URLSearchParams(origin);
queryParams.value.taskId = urlParams.get('taskId');
queryParams.value.id = urlParams.get('id');
auditingParams.value.taskId = urlParams.get('taskId')
const ticketMatch = origin.match(/ticket=([^&]*)/);
const ticket = ticketMatch ? ticketMatch[1] : '';
try {
const { data: result } = await iwsLoginAPI({
ticket: ticket,
sysType: 1,
})
// 1. token
await memberStore.setToken(result.access_token)
// 2.
const res = await getUserInfoAPI()
memberStore.setUserInfo(res.user)
uni.setStorageSync('id', res.user.userId)
userId.value = res.user.userId
uni.setStorageSync('deptName', res.user?.dept?.deptName)
uni.setStorageSync('urlPermissions', res.urlPermissions ? res.urlPermissions : [])
//
initPageData();
} catch (error) {
console.error('登录失败:', error)
uni.showToast({ title: '登录失败,请重试', icon: 'none' })
}
}
})
const initPageData = () => {
console.log(queryParams.value)
getReviewInfo(queryParams.value.id)
fetchAuditInfo()
//
getNodeAuditStatus()
}
const getConfig = async () => {
try {
const res = await getConfigApi()
uni.setStorageSync('systemConfig', res.data)
} catch (error) {
console.log('🚀 ~ getConfig ~ error:', error)
}
}
// onShow
onShow(() => {
//
})
// onShow(() => {
// console.log(queryParams.value)
// // getCodeDetailData(queryParams.value.id,queryParams.value.publishTask,queryParams.value.typeId)//
// getReviewInfo(queryParams.value.id)
// fetchAuditInfo()
// })
//
const getReviewInfo = async (id) => {
console.log("yyyyyyyyyy",id)
const res = await receiveDetailAPI(id)
console.log("zzzzzzzzz",res)
formData.value=res.data.leaseApplyInfo;
// queryCodeParams.value.typeId = queryParams.value.typeId;
// queryCodeParams.value.pageNum = 1;
codeDeviceList.value = res.data.leaseApplyDetailsList;
// getCodeDeviceListData()//
}
const fetchAuditInfo = async () => {
try {
console.log('xxxxxxxxxxxxxx',queryParams.value.id)
// API
const res = await getAuditInfoAPI({taskId:queryParams.value.taskId})
console.log('🚀 ~ fetchAuditInfo ~ res:', res)
auditingList.value = res.rows
console.log('🚀 ~ fetchAuditInfo ~ auditingList:', auditingList.value)
} catch (error) {
//
console.log('🚀 ~ fetchAuditInfo ~ error:', error)
}
}
const getNodeAuditStatus = async () => {
try {
// API
const res = await getNodeAuditStatusAPI({taskId:queryParams.value.taskId})
console.log('🚀 ~ getNodeAuditStatus ~ res:', res)
if(res.data){
auditStatus.value = res.data.auditStatus
}else{
auditStatus.value = ''
}
} catch (error) {
//
console.log('🚀 ~ getNodeAuditStatus ~ error:', error)
}
}
//
const getCodeDeviceListData = async () => {
const res = await getCodeDeviceListAPI(queryCodeParams.value)
codeDeviceList.value.push(...res.rows)
if (codeDeviceList.value.length > 0) {
codeDeviceList.value = codeDeviceList.value.map((e) => {
return { ...e, checked: false }
})
}
total.value = res.total
}
// //
// const onCodeSearch = () => {
// queryCodeParams.value.pageNum = 1
// codeDeviceList.value = []
// getCodeDeviceListData()
// }
//
const handleReview = (action) => {
uni.showModal({
title: action == 1 ? '通过' : '驳回',
placeholderText: '请输入审核意见',
editable: true,
confirmText: '确认',
cancelText: '取消',
success: async (res) => {
if (res.confirm) {
const comment = res.content;
//
const currentAuditing = auditingList.value.filter(e => e.configValues.includes(userId.value)) //
const currentIndex = auditingList.value.findIndex(e => e.configValues.includes(userId.value)) //
auditingParams.value.remark = comment
const { recordId, id, typeId, } = currentAuditing[0]
Object.assign(auditingParams.value, {
typeId,
recordId,
nodeId: id
})
auditingParams.value.isAccept = action
auditingParams.value.leaseId = formData.value.id
auditingParams.value.taskCode = formData.value.code
auditingParams.value.unitName = formData.value.leaseUnit
auditingParams.value.projectName = formData.value.leaseProject
if (currentIndex !== auditingList.value.length - 1) {
auditingParams.value.nextNodeId =auditingList.value[currentIndex + 1].id
}
console.log("yyyyyyyyyyyyyyy",auditingParams.value)
const submitRes = await submitAuditingApi(auditingParams.value)
console.log("zrrrrrrrrrrrrrrrrrr",submitRes)
if (submitRes.code === 200) {
uni.showToast({
title: '审核成功',
icon: 'none',
})
initPageData();
// uni.navigateBack(); //
}
} else if (res.cancel) {
console.log('用户取消操作');
}
}
});
};
//
const onScrollTolower = debounce(() => {
// console.log('--')
if (total.value > codeDeviceList.value.length) {
queryCodeParams.value.pageSize += 5
getCodeDeviceListData()
}
}, 500)
//
const onHandleOutbound = async () => {
const isSelect = codeDeviceList.value.some((e) => e.checked === true)
if (!isSelect) {
uni.showToast({
title: '请勾选需要出库的设备',
icon: 'none',
})
return
}
//
const { typeId, parentId,publishTask } = queryParams.value
//
const paramsList = []
codeDeviceList.value.map((e) => {
if (e.checked) {
paramsList.push({
leaseType: 0,
maId: e.maId,
maCode: e.maCode,
manageType: 0,
outNum: 1,
parentId,
typeId,
publishTask,
})
}
})
console.log("mmmmmmmmmmmmmmmm",paramsList)
const res = await setOutboundNumAPI({ leaseOutDetailsList: paramsList })
if (res.code === 200) {
uni.showToast({
title: '出库成功!',
icon: 'none',
})
getCodeDetailData(queryParams.value.id,queryParams.value.publishTask,queryParams.value.typeId)//
}
}
</script>
<style lang="scss" scoped>
.black-text {
color: #000;
}
.custom-steps {
margin-bottom: 5px;
}
.custom-steps.vertical {
display: flex;
flex-direction: column;
padding-left: 100rpx; /* 增加左侧留白 */
padding-right: 20rpx;
padding-top: 5rpx;
}
.custom-steps.vertical .step-item {
display: flex;
flex-direction: row;
margin-bottom: 5rpx; /* 增加步骤项间距 */
position: relative;
}
.custom-steps.vertical .step-container {
display: flex;
flex-direction: column;
align-items: flex-start;
margin-right: 28rpx; /* 增加图标与文字间距 */
position: relative;
}
.custom-steps.vertical .step-line {
position: absolute;
width: 2px;
top: 26px;
bottom: -30px;
left: 13px;
// transform: translateX(-50%);
}
.custom-steps.vertical .step-content {
flex: 1;
text-align: left;
padding-top: 6rpx;
padding-right: 20rpx;
}
// .step-item {
// display: flex;
// flex-direction: column;
// align-items: center;
// flex: 1;
// position: relative;
// }
.step-icon {
width: 30px;
height: 30px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
color: white;
z-index: 1;
}
.step-icon.pending {
background-color: #19a4a0;
}
.step-icon.approved {
background-color: #19a4a0;
}
.step-icon.rejected {
background-color: #19a4a0;
}
// .step-line {
// position: absolute;
// top: 13px;
// left: 50%;
// width: 100%;
// height: 2px;
// background-color: #19a4a0;
// }
.step-line.approved {
background-color: #19a4a0;
}
.step-line.rejected {
background-color: #19a4a0;
}
// .step-content {
// display: flex;
// flex-direction: column;
// align-items: center;
// margin-top: 6px;
// }
.step-title {
font-size: 14px;
font-weight: 400;
margin-bottom: 1px;
margin-left:10px;
text-align: center;
}
.step-title.pending {
color: #19a4a0;
}
.step-title.approved {
color: #19a4a0;
}
.step-title.rejected {
color: #19a4a0;
}
.step-desc {
font-size: 13px;
text-align: center;
color: #666; //
}
.step-desc.pending {
font-size: 13px;
color: #409EFF; //
}
.step-desc.approved {
font-size: 13px;
color: #13ce66; // 绿
}
.step-desc.rejected {
font-size: 13px;
color: #ff4d4f; //
}
.page-container {
display: flex;
height: 100%;
flex-direction: column;
background-color: #f7f8fa;
padding: 24rpx;
padding-top: 44px;
:deep(.uni-steps-item-title.accepted-title) {
color: red !important;
}
:deep(.uni-steps-item-title.rejected-title) {
color: green !important;
}
// :deep(.uni-steps-item) {
// //
// // .uni-steps-item-active
// &::after {
// // 线
// background-color: #52c41a !important;
// }
// .uni-steps-item-icon {
// //
// background-color: #52c41a !important;
// border-color: #52c41a !important;
// }
// .uni-steps-item-title {
// //
// color: #52c41a !important;
// }
// .uni-steps-item-description {
// //
// color: #52c41a !important;
// }
// }
.steps-title {
display: block;
text-align: center; //
color: #19a4a0; // 绿
font-size: 32rpx; //
margin-bottom: 20rpx; //
}
.table-list-item {
background: #fff;
padding: 32rpx;
border-radius: 20rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
margin-bottom: 24rpx;
//
:deep(.uni-forms) {
.uni-forms-item {
margin-bottom: 24rpx;
padding: 0;
&:last-child {
margin-bottom: 0;
}
.uni-forms-item__label {
color: #8c8c8c;
font-size: 28rpx;
font-weight: 500;
padding: 0;
line-height: 1.8;
}
.uni-forms-item__content {
display: flex;
align-items: center;
min-height: unset;
}
}
}
//
.coding-btn {
padding: 16rpx 0;
background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
border-radius: 12rpx;
text-align: center;
color: #fff;
font-size: 28rpx;
font-weight: 600;
box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
transition: all 0.3s ease;
&:active {
transform: scale(0.98);
opacity: 0.9;
}
//
&.search-btn {
padding: 12rpx 0;
background: #fff;
color: #fff;
border: 2rpx solid rgba(255, 152, 0, 0.5);
background: linear-gradient(to bottom, rgba(23, 237, 3, 0.957), rgba(23, 237, 3, 0.957));
box-shadow: none;
font-weight: 600;
letter-spacing: 1rpx;
&:active {
background: rgba(23, 237, 3, 0.957);
border-color: rgba(23, 237, 3, 0.957);
transform: translateY(1rpx);
}
}
&.search-btnTwo {
padding: 12rpx 0;
background: #fff;
color: #fff;
border: 2rpx solid rgba(255, 152, 0, 0.5);
background: linear-gradient(to bottom, rgba(255, 8, 0, 0.911), rgba(255, 8, 0, 0.911));
box-shadow: none;
font-weight: 600;
letter-spacing: 1rpx;
&:active {
background: rgba(255, 8, 0, 0.911);
border-color: rgba(255, 8, 0, 0.911);
transform: translateY(1rpx);
}
}
}
//
:deep(.uni-row) {
// margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
.uni-col-6 {
color: #8c8c8c;
font-size: 28rpx;
font-weight: 500;
}
.cont {
color: #262626;
font-size: 28rpx;
font-weight: 500;
line-height: 1.8;
}
}
//
:deep(.uni-easyinput__content) {
background-color: #f7f8fa;
border: 2rpx solid #e8e8e8;
border-radius: 12rpx;
height: 75rpx;
transition: all 0.3s ease;
&:focus-within {
border-color: #3784fb;
box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
}
.uni-easyinput__content-input {
font-size: 28rpx;
color: #262626;
}
}
//
:deep(checkbox) {
.wx-checkbox-input {
width: 36rpx;
height: 36rpx;
border-radius: 8rpx;
border: 2rpx solid #e8e8e8;
background: transparent;
&.wx-checkbox-input-checked {
background: #3784fb;
border-color: #3784fb;
&::before {
font-size: 28rpx;
color: #fff;
}
}
&.wx-checkbox-input-disabled {
background: #f5f5f5;
border-color: #e8e8e8;
}
}
}
}
//
.outbound-btn {
position: fixed;
bottom: 40rpx;
left: 50%;
transform: translateX(-50%);
width: 90%;
height: 88rpx;
background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
text-align: center;
line-height: 88rpx;
color: #fff;
border-radius: 12rpx;
font-size: 32rpx;
font-weight: 600;
box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
transition: all 0.3s ease;
&:active {
transform: translateX(-50%) scale(0.98);
opacity: 0.9;
}
}
}
//
.loading-text {
text-align: center;
font-size: 26rpx;
color: #8c8c8c;
padding: 32rpx 0;
letter-spacing: 1rpx;
}
.form-section {
background: #fff;
border-radius: 20rpx;
margin-bottom: 24rpx;
overflow: hidden;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
//
.section-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 24rpx 32rpx;
background: #fff;
cursor: pointer;
transition: all 0.3s ease;
&:active {
background: #f7f8fa;
}
.title {
font-size: 32rpx;
font-weight: 600;
color: #262626;
}
.toggle-icon {
font-size: 40rpx;
color: #8c8c8c;
transform: rotate(90deg);
transition: transform 0.3s ease;
display: inline-block;
&.is-expanded {
transform: rotate(-90deg);
}
}
}
//
.form-content {
max-height: 0;
overflow: hidden;
transition: max-height 0.3s ease-out;
&.is-expanded {
max-height: 800rpx; /* 高度可进一步减小 */
}
:deep(.uni-forms) {
padding: 0 20rpx 0rpx; /* 减少底部内边距 */
}
:deep(.uni-forms-item) {
margin-bottom: 0rpx !important; /* 关键:行间距缩小 */
padding: 0rpx 0 !important; /* 减少项内边距 */
.uni-forms-item__label {
color: #8c8c8c;
padding-bottom: 0rpx !important; /* 标签与内容间距 */
line-height: 2.8; //
}
.form-view {
color: #262626;
font-size: 28rpx;
line-height: 2.8 !important; /* 减小文本行高 */
}
}
}
}
</style>

View File

@ -0,0 +1,736 @@
<template>
<!-- 领料出库 -->
<view class="page-container">
<view class="complete-btn">
<view class="btn" @click="changeTab(1)">
<span>未完成</span>
<div v-if="active == 1" class="bt-line"></div>
</view>
<view class="btn" style="margin-left: 80rpx" @click="changeTab(2)">
<span>已完成</span>
<div v-if="active == 2" class="bt-line"></div>
</view>
</view>
<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-col :span="12">
<view>
<uni-datetime-picker
v-model="queryParams.startTime"
type="date"
placeholder="开始日期"
/>
</view>
</uni-col>
-
<uni-col :span="12">
<view>
<uni-datetime-picker
v-model="queryParams.endTime"
type="date"
placeholder="结束日期"
/>
</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"
v-for="(item, index) in tableList"
@click="onReview(item)"
>
<uni-swipe-action class="swipe-action">
<uni-swipe-action-item>
<div class="title">
<span class="code">{{ item.code }}</span>
<div class="cont">
<uni-tag
:text="
item.taskStatus === 2 ? '已完成' :
item.taskStatus === 3 ? '已驳回' :
item.taskStatus === 1 ? '审核中' :
'待审核'
"
:type="
item.taskStatus === 2 ? 'success' :
item.taskStatus === 3 ? 'error' :
item.taskStatus === 1 ? 'primary' :
'warning'
"
: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.createBy }}</div>
</uni-col>
</uni-row>
<uni-row :gutter="24">
<uni-col :span="6">领料单号</uni-col>
<uni-col :span="18">
<div class="cont">{{ item.code }}</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="8">领料人电话</uni-col>
<uni-col :span="16">
<div class="cont">{{ item.phone }}</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 { getPickingReviewListAPI } from '@/services/picking/review.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([
new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
new Date().toISOString().split('T')[0],
]) //
//
const queryParams = ref({
startTime: dateArray.value[0] || '', //
endTime: dateArray.value[1] || '', //
keyWord: '', //
statusList: [0,1], //
pageNum: 1,
pageSize: 3,
})
const userId = ref('') // id
//
const reviewOptions = reactive([
{
text: '审核',
style: {
backgroundColor: '#ecb234',
fontSize: '28rpx',
},
},
])
//
const viewOptions = reactive([
{
text: '查看',
style: {
backgroundColor: '#52c41a',
fontSize: '28rpx',
},
},
])
// /
const onReview = (item) => {
if(item.taskStatus === 3 || item.taskStatus === 2){
uni.navigateTo({
url: `/pages/businessAudit/directAudit/details?params=${JSON.stringify({
id: item.id,
taskId: item.taskId,
flowId: item.flowId,
nodeId: item.nodeId,
type: 2,
})}`,
})
}else if((item.taskStatus === 1 || item.taskStatus === 0) && typeof item.configValue === 'string' && item.configValue.includes(userId.value)){
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxx",userId)
uni.navigateTo({
url: `/pages/businessAudit/directAudit/details?params=${JSON.stringify({
id: item.id,
taskId: item.taskId,
flowId: item.flowId,
nodeId: item.nodeId,
type: 1,
})}`,
})
}
// const params = {
// id: item.id,
// taskId: item.taskId,
// flowId: item.flowId,
// nodeId: item.nodeId,
// type: e.content.text ==='' ? 1 : 2,
// }
// console.log('params', params)
// uni.navigateTo({
// url: `/pages/picking/review/details?params=${JSON.stringify(params)}`,
// })
}
const handleItemxxxx = (item) => {
console.log('itemxxxxxxxxxxxxxxxxxxxxxxxxxx', item)
}
// 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) => {
try {
uni.showLoading({
title: '加载中...',
mask: true
})
if (isSearch) {
//
queryParams.value.pageNum = 1;
tableList.value = [];
}
console.log('queryParams.value查询参数', queryParams.value)
const res = await getPickingReviewListAPI(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]
const merged = [...tableList.value, ...res.data.rows]
// id
const unique = []
const seen = new Set()
for (const item of merged) {
if (!seen.has(item.taskId)) {
seen.add(item.taskId)
unique.push(item)
}
}
console.log('🚀 ~ getTableList ~ unique:', unique)
tableList.value = unique
}
}
} catch (error) {
console.log('🚀 ~ getTableList ~ error:', error)
} finally {
uni.hideLoading()
}
}
// //
// onLoad(() => {
// getTableList()
// })
onShow(() => {
queryParams.value.pageNum = 1;
tableList.value = []
total.value = 0
userId.value = String(uni.getStorageSync('id'))
console.log('userId', userId.value)
getTableList()
})
//
const onScrollTolower = debounce(() => {
console.log('触底事件')
if (total.value > tableList.value.length) {
queryParams.value.pageSize += 5
getTableList()
}
}, 500)
// tap
const changeTab = (index) => {
active.value = index
console.log('index', index)
if (index == 2) {
queryParams.value.statusList = [2,3] //
queryParams.value.pageNum = 1
getTableList(true)
} else if (index == 1) {
queryParams.value.statusList = [0,1] //
queryParams.value.pageNum = 1
getTableList(true)
}
}
//
const handleItem = (item) => {
uni.navigateTo({ url: `/pages/picking/outbound/details?id=${item.id}&taskId=${item.taskId}` })
}
//
const finish = computed(() => {
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;
padding: 10rpx;
/* background: #fff;
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: 60rpx;
background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
text-align: center;
line-height: 60rpx;
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;
}
}
//
.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

@ -71,6 +71,24 @@
</text>
</view>
</view>
<view class="new-purchase" v-if="auditInfoListTwo.length>0">
<div class="title-text">
<div></div>
<div class="purchase-title">业务审核</div>
</div>
<view
class="purchase-item"
:key="index"
@tap="onNavigateTo(item.url)"
v-for="(item, index) in auditInfoListTwo"
>
<image :src="item.iconSrc" mode="scaleToFill" />
<text>
{{ item.title }}
</text>
</view>
</view>
</view>
</template>
@ -190,6 +208,8 @@ const integratedQueryList = ref([
},
])
// 使 newInfoList
const integratedQueryListTwo = computed(() => {
//
@ -199,6 +219,25 @@ const integratedQueryListTwo = computed(() => {
return integratedQueryList.value.filter(item => urlPermissions.value.includes(item.url))
})
//
const auditInfoList = ref([
{
title: '直转审核',
url: '/pages/businessAudit/directAudit/index',
iconSrc: '../../static/workbench/panDian.png',
},
])
// 使 newInfoList
const auditInfoListTwo = computed(() => {
//
if (urlPermissions.value.includes("*:*:*")) {
return auditInfoList.value;
}
return auditInfoList.value.filter(item => urlPermissions.value.includes(item.url))
})
const onNavigateTo = (url) => {
uni.navigateTo({ url })
}

View File

@ -19,7 +19,7 @@
class="table-list-item"
>
<uni-swipe-action class="swipe-action">
<uni-swipe-action-item :right-options="item.status==2 ? options2 : options"
<uni-swipe-action-item :right-options="item.status==2 ? options2 : item.alNum ==0 ? options3 : options"
@click="onClick($event, item)">
<div class="title">
<span class="main-title">领料出库</span>
@ -95,7 +95,7 @@
<script setup>
import { ref, onUnmounted } from 'vue'
import { getOutboundDetailsAPI,getOutboundDetailsAPITwo,leaseOutBackApi } from '@/services/picking/outbound.js'
import { getOutboundDetailsAPI,getOutboundDetailsAPITwo,leaseOutBackApi,backOutDetailsApi } from '@/services/picking/outbound.js'
import { onLoad, onShow } from '@dcloudio/uni-app'
import { formatDiff } from '@/utils/bnsBase.js'
const taskStatus = ref(3)//
@ -186,7 +186,8 @@ const getOutboundDetailsData = async () => {
options.value = [
{ text: '出库',style: {backgroundColor: '#84c649',color: '#fff',fontSize: '28rpx'} },
// { text: '退',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'} },
{ text: '查看',style: {backgroundColor: '#3784fb',color: '#fff',fontSize: '28rpx'} }
{ text: '查看',style: {backgroundColor: '#3784fb',color: '#fff',fontSize: '28rpx'} },
{ text: '退回',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'} }
];
options2.value = [
// { text: '退',style: {backgroundColor: '#ed6042',color: '#fff',fontSize: '28rpx'}},
@ -318,6 +319,14 @@ const options = ref([
// color: '#fff',
fontSize: '28rpx',
},
},
{
text: '退回',
style: {
backgroundColor: '#ed6042',
// color: '#fff',
fontSize: '28rpx',
},
}
])
const options2 = ref([
@ -331,8 +340,27 @@ const options2 = ref([
},
])
const options3 = ref([
{
text: '出库',
style: {
backgroundColor: '#84c649',
// color: '#fff',
fontSize: '28rpx',
},
},
{
text: '查看',
style: {
backgroundColor: '#3784fb',
// color: '#fff',
fontSize: '28rpx',
},
}
])
//
const onClick = (e, item) => {
const onClick = async (e, item) => {
console.log("tttttttttt",e,item)
if(taskStatus.value==3){//
console.log("333333333333333333333333333")
@ -347,6 +375,33 @@ const onClick = (e, item) => {
if (e.content.text == '查看') {
checkViewDetail(item)//
}
if (e.content.text == '退回') {
let param ={
taskId:leaseApplyInfo.value.taskId,
typeId:item.typeId,
parentId:item.parentId,
newTypeId:item.newTypeId,
alNum:item.alNum,
outNum:item.alNum,
maCodeVoList:item.maCodeVoList
}
const res = await backOutDetailsApi(param)//退
if(res.code==200){
uni.showToast({
title: '退回成功!',
icon: 'none',
})
setTimeout(() => {
getOutboundDetailsData()
}, 500)
}else{
uni.showToast({
title: res.msg,
icon: 'none',
})
}
}
}
if(taskStatus.value==4){//
checkViewDetail(item)//

View File

@ -116,6 +116,15 @@ export const getDeviceListAPINew = (data) => {
})
}
export const backOutDetailsApi = (data) => {
return http({
method: 'POST',
url: '/material/leaseTask/leaseOutReject',
data,
})
}
//出库退回
export const leaseOutBackApi = (data) => {