diff --git a/src/pages/businessAudit/directAudit/details.vue b/src/pages/businessAudit/directAudit/details.vue index 0230eb0..727c698 100644 --- a/src/pages/businessAudit/directAudit/details.vue +++ b/src/pages/businessAudit/directAudit/details.vue @@ -33,8 +33,9 @@ v-if="index < auditingList.length - 1" class="step-line" :class="{ - 'approved': item.isAccept === 1, - 'rejected': item.isAccept !== 0 && item.isAccept !== 1 + 'approved': item.isAccept == 1, + 'rejected': item.isAccept != 0 && item.isAccept != 1 , + 'pending': item.isAccept == 0 }" > @@ -61,7 +62,7 @@ }">{{ item.isAccept == 0 ? '待审批' : item.isAccept == 1 ? '已通过' : '已驳回' }}
审批人：{{ item.auditBy ? item.auditBy : '' }}
审批时间：{{ item.createTime ? item.createTime : '' }}
- 审批意见：{{ '' }} + 审批意见：{{ item.remark ? item.remark : '' }} @@ -86,7 +87,7 @@ - + 基本信息 @@ -94,26 +95,40 @@ - - {{ formData.leaseUnit }} + + {{ formData.backUnitName }} - - {{ formData.leaseProject }} + + {{ formData.backProName }} - - {{ formData.leasePerson }} + + {{ formData.backMan }} - - - {{ formData.leaseUnit }} + + + {{ formData.backPhone }} - - {{ formData.phone }} + + {{ formData.leaseUnitName }} - - {{ formData.maTypeNames }} + + {{ formData.leaseProName }} + + + {{ formData.leaseMan }} + + + + {{ formData.leasePhone }} + + +
+
+ + +
+
+ @@ -126,20 +141,24 @@ 序号 + 直转数量 类型名称 规格型号 - 计量单位 - 预领数量 - 备注 + 计量单位 + 领料数量 + 领料人 + 领料日期 {{ index + 1 }} - {{item.maTypeName}} - {{item.typeName}} + {{item.directNum}} + {{item.typeName}} + {{item.typeModelName}} {{item.unitName}} - {{item.preNum}} - {{item.remark}} + {{item.useNum}} + {{item.leasePerson}} + {{item.startTime}} @@ -157,10 +176,12 @@ 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 { getNodeAuditStatusAPI } from '@/services/picking/review.js' +import { getAuditInfoAPI,receiveDetailAPI,submitAuditingApi} from '@/services/directApply/review.js' import { appLoginAPI, getUserInfoAPI, iwsLoginAPI,getConfigApi } from '@/services/index.js' import { debounce } from 'lodash-es' import { useMemberStore } from '@/stores' +import PreviewImg from '@/components/PreviewImg/index.vue' const memberStore = useMemberStore() // const query = defineProps() // 获取上级页面传递的路由参数 // const queryParams = JSON.parse(query.queryParams) @@ -171,7 +192,7 @@ const queryParams = ref({ const queryParamsInfo = ref({}) const formData = ref({}) const codeDeviceList = ref([]) - +const imgList = ref([]) // 图片列表，用于回显 const total = ref(0) const auditStatus = ref('') // 编码设备列表查询参数 @@ -195,6 +216,7 @@ const auditingParams = ref({ taskCode: '', // 任务编码 unitName: '', // 单位名称 projectName: '', // 项目名称 + taskTypeId: 16, // 任务类型id }) const auditingList = ref([]) //流程记录 @@ -216,6 +238,7 @@ onLoad(async(options) => { if (origin.indexOf('params') != -1) { queryParams.value = JSON.parse(options.params) auditingParams.value.taskId = queryParams.value.taskId + auditingParams.value.nodeId = queryParams.value.nodeId type.value = queryParams.value.type // 直接执行后续操作 initPageData(); @@ -224,6 +247,7 @@ onLoad(async(options) => { queryParams.value.taskId = urlParams.get('taskId'); queryParams.value.id = urlParams.get('id'); auditingParams.value.taskId = urlParams.get('taskId') + auditingParams.value.nodeId = urlParams.get('nodeId') const ticketMatch = origin.match(/ticket=([^&]*)/); const ticket = ticketMatch ? ticketMatch[1] : ''; @@ -281,22 +305,21 @@ onShow(() => { // 获取详情列表 const getReviewInfo = async (id) => { console.log("yyyyyyyyyy",id) - const res = await receiveDetailAPI(id) + const res = await receiveDetailAPI({id:id}) console.log("zzzzzzzzz",res) - formData.value=res.data.leaseApplyInfo; - - + formData.value = res.data; + imgList.value = res.data.dirUrls // queryCodeParams.value.typeId = queryParams.value.typeId; // queryCodeParams.value.pageNum = 1; - codeDeviceList.value = res.data.leaseApplyDetailsList; + codeDeviceList.value = res.data.directApplyDetails; // getCodeDeviceListData()//获取编码列表 } const fetchAuditInfo = async () => { try { - console.log('xxxxxxxxxxxxxx',queryParams.value.id) + console.log('xxxxxxxxxxxxxx',queryParams.value) // 调用导入的 API 函数 - const res = await getAuditInfoAPI({taskId:queryParams.value.taskId}) + const res = await getAuditInfoAPI({taskId:queryParams.value.taskId,taskType:16}) console.log('🚀 ~ fetchAuditInfo ~ res:', res) auditingList.value = res.rows @@ -356,9 +379,9 @@ const handleReview = (action) => { 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 currentAuditing = auditingList.value.filter(e => e.nodeId.toString().includes(auditingParams.value.nodeId?.toString() || '')) // 获取当前审核的节点 + const currentIndex = auditingList.value.findIndex(e => e.nodeId.toString().includes(auditingParams.value.nodeId?.toString() || '')) // 获取当前的索引 + console.log("hhhhhhh",currentAuditing,currentIndex) const { recordId, id, typeId, } = currentAuditing[0] Object.assign(auditingParams.value, { typeId, @@ -373,6 +396,8 @@ const handleReview = (action) => { auditingParams.value.unitName = formData.value.leaseUnit auditingParams.value.projectName = formData.value.leaseProject + auditingParams.value.taskTypeId = 16 + auditingParams.value.remark = res.content if (currentIndex !== auditingList.value.length - 1) { auditingParams.value.nextNodeId =auditingList.value[currentIndex + 1].id } @@ -451,6 +476,39 @@ const onHandleOutbound = async () => { + \ No newline at end of file diff --git a/src/pages/businessAudit/directAudit/index.vue b/src/pages/businessAudit/directAudit/index.vue index ffab262..63926ae 100644 --- a/src/pages/businessAudit/directAudit/index.vue +++ b/src/pages/businessAudit/directAudit/index.vue @@ -69,18 +69,18 @@
@@ -94,47 +94,34 @@ 申请人： -
{{ item.createBy }}
+
{{ item.leaseMan }}
 - 领料单号： + 转出单位： -
{{ item.code }}
+
{{ item.backUnitName }}
 - 领料物资： + 转出工程： -
{{ item.maTypeNames }}
+
{{ item.backProName }}
 - 领料单位： + 转入单位： -
{{ item.leaseUnit }}
+
{{ item.leaseUnitName }}
 - 领料工程： + 转入工程： -
{{ item.leaseProject }}
+
{{ item.leaseProName }}
 - - 领料人： - -
{{ item.leasePerson }}
- - - - 领料人电话： - -
{{ item.phone }}
- - - - + @@ -147,7 +134,7 @@