报表申报智能运输页面完成

This commit is contained in:
zx
2026-04-23 14:35:54 +08:00
parent 6f1db0f92e
commit 5ca85c1f0d
53 changed files with 3659 additions and 292 deletions

View File

@@ -3,9 +3,9 @@
<navigation :title="pathParams.billNo" :back-url="backUrl">
<template #right>
<view class="right-btn flex align-center justify-center ">
<uv-image @click="onPrinter" src="../../../../static/printer.png" width="20px" height="20px"
<uv-image @tap="onPrinter" src="../../../../static/printer.png" width="20px" height="20px"
style="margin-top:10rpx" />
<uv-image @click="toEditOrAway('2')" src="../../../../static/edit.png" class="ml-24" width="20px"
<uv-image @tap="toEditOrAway('2')" src="../../../../static/edit.png" class="ml-24" width="20px"
height="20px" style="margin-top:10rpx" />
</view>
</template>
@@ -18,11 +18,11 @@
<view v-if="detailInfo?.billType == '0' && !flag"
:class="getBillType(detailInfo?.billType, detailInfo?.status) != '物料部分入库' ? 'bottom' : 'bottom1'">
<uv-button type="error" v-if="getBillType(detailInfo?.billType, detailInfo?.status, flag) != '物料部分入库'"
text="作废" @click="toObsolete"></uv-button>
<uv-button type="primary" text="入库单入库" @click="toEditOrAway('1')"></uv-button>
text="作废" @tap="toObsolete"></uv-button>
<uv-button type="primary" text="入库单入库" @tap="toEditOrAway('1')"></uv-button>
</view>
<view v-if="detailInfo?.billType == '0' && flag" class="bottom1">
<uv-button type="primary" text="出库单出库" @click="toEditOrAway('1')"></uv-button>
<uv-button type="primary" text="出库单出库" @tap="toEditOrAway('1')"></uv-button>
</view>
</view>
</template>
@@ -130,6 +130,16 @@ const setDetailInfoToStorage = (type) => {
// 有 type直接存储全部 itemList
uni.setStorageSync('app_material', itemList)
}
// 技术鉴定表
const technicalEvaluationList = {
fileList: data?.appraisalFileList,
remark: data?.appraisalRemark,
createTime: data?.appraisalTime,
id: data?.appraisalId,
appraisalNo: data?.appraisalNo,
}
uni.setStorageSync('app_technical', technicalEvaluationList)
}
/**

View File

@@ -9,7 +9,7 @@
<material-list ref="materialRef" :formData="formData" isEdit="5" :pathParams="pathParams":extendData="{ selectMaterialList }" />
<!-- 底部操作栏 -->
<view class="bottom">
<uv-button type="primary" @click="submitForm">入库</uv-button>
<uv-button type="primary" @tap="submitForm">入库</uv-button>
</view>
</view>
</template>

View File

@@ -3,13 +3,14 @@
<view class="contentBox">
<!-- 仓库信息 - 仓库存储区 -->
<warehousing-info ref="warehousingInfoRef" :warehouseInfo="warehouseInfo"
:pathParams="{ ...pathParams, type: 'stockIn' }" />
:pathParams="{ ...pathParams, type: pathParams.type === 'my' ? 'my' : 'stockIn' }" />
<!-- 物料列表 - 添加物料 -->
<material-list ref="materialRef" :formData="formData" isEdit="1" backStr="stockIn" :pathParams="pathParams" />
<material-list ref="materialRef" :formData="formData" isEdit="1"
:backStr="pathParams.type === 'my' ? 'my' : 'stockIn'" :pathParams="pathParams" />
<!-- 底部操作栏 -->
<view class="bottom">
<uv-button @click="scanCode">扫码添加</uv-button>
<uv-button type="primary" @click="submitForm">提交</uv-button>
<uv-button @tap="scanCode">扫码添加</uv-button>
<uv-button type="primary" @tap="submitForm">提交</uv-button>
</view>
</view>
</template>
@@ -35,7 +36,17 @@ const OPERATE_CONFIG = {
stockIn: {
back: '/pages/warehousing/stockIn/components/detail',
title: ''
}
},
//
declaration: {
back: '/pages/warehousing/Declaration/components/detail',
title: ''
},
//
my: {
back: '/pages/warehousing/Declaration/components/detail',
title: ''
},
}
// 数据:路径参数
const pathParams = ref('')
@@ -125,15 +136,15 @@ const scanCode = () => {
// 提交表单
const submitForm = () => {
const info = warehousingInfoRef.value.getWarehousingInfo()
const materialInfo = materialRef.value.getMaterialList()
const materialInfo = materialRef.value.getMaterialList() || []
let params = {
warehouseCode: info.warehousing?.[0].deptCode || info.warehousing?.[0].deptId,
warehouseName: info.warehousing?.[0].deptName,
areaCode: info.storageArea?.[0].deptCode || info.storageArea?.[0].deptId,
areaName: info.storageArea?.[0].deptName,
remark: info.remark,
billRemark: info.remark,
warehouseCode: info?.warehousing?.[0]?.deptCode || info?.warehousing?.[0]?.deptId,
warehouseName: info?.warehousing?.[0]?.deptName,
areaCode: info?.storageArea?.[0]?.deptCode || info.storageArea?.[0]?.deptId,
areaName: info?.storageArea?.[0]?.deptName,
remark: info?.remark,
billRemark: info?.remark,
itemList: _.map(materialInfo, (i) => ({ ...i.material }))
}
try {
@@ -142,7 +153,13 @@ const submitForm = () => {
addStockIn(params).then((res) => {
if (res.code == 200) {
uni.showToast({ title: '入库单创建成功', icon: 'success', mask: true })
uni.navigateTo({ url: OPERATE_CONFIG.list.back })
if (pathParams.value.type == 'my') {
const queryStr = objectToQuery(pathParams.value)
uni.navigateTo({ url: OPERATE_CONFIG.my.back + queryStr })
} else {
uni.navigateTo({ url: OPERATE_CONFIG.list.back })
}
}
})
} else {
@@ -169,7 +186,7 @@ onLoad((options) => {
console.log('options==>', options);
// 若有billNo传入 修改标题且为编辑 stockIn:入库编辑 stockIn-putAway入库单入库编辑
if (options?.billNo) {
if (options?.billNo && options?.type != 'my') {
const query = objectToQuery(options)
title.value = options.billNo
backUrl.value = OPERATE_CONFIG.stockIn.back + query;