物资-领用退回历史

src/views/flowable/task/TaskForm.vue

@@ -80,6 +80,26 @@
 				</vxe-table>
 			</el-tab-pane>
 
+			<el-tab-pane label="领用退回历史" v-if="psiReturnId" name="form-psi-return">
+				<vxe-table ref="returnTable" border="inner" :key="111" size="small" class="vxe-table-element"
+					max-height="1000px" :data="dataListHiCollect">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="160" align="center" title="退回物品" field="returnGoods">
+						<template #default="scope">
+							<span v-if="commonJS.isNotEmpty(scope.row.returnGoods)"> {{ scope.row.returnGoods }} </span>
+							<span v-else> -- </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="退回申请人" field="returnUserName"></vxe-column>
+					<vxe-column min-width="160" align="center" title="退回时间" field="createTime"></vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template #default="scope">
+							<el-button type="text" size="small" @click="hiPsiDetailCollect(scope.row)">退回详情</el-button>
+						</template>
+					</vxe-column>
+				</vxe-table>
+			</el-tab-pane>
+
 			<el-tab-pane label="归档历史" v-if="commonJS.isNotEmpty(cwArchiveHiFlag)" name="form-cwArchive">
 				<vxe-table ref="wareHouseTable" border="inner" size="small" :key="222" max-height="1000px"
 					class="vxe-table-element" :data="cwArchiveDataListHiCollect">
@@ -182,6 +202,7 @@
 		<user-select-dialog title="选择加签用户" ref="addSignTaskUserSelectDialog"
 			@doSubmit="selectUsersToAddSignTask"></user-select-dialog>
 		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
+		<PsiCollectReturnHi ref="psiCollectReturnHi"></PsiCollectReturnHi>
 		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 		<ProjectReportArchiveForm ref="projectReportArchiveForm"></ProjectReportArchiveForm>
 	</div>
@@ -190,6 +211,7 @@
 <script>
 // import FlowChart from '../modeler/FlowChart'
 import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
+import PsiCollectReturnHi from '@/views/psiManagement/collect/CollectReturnHiForm'
 import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
 import ProjectReportArchiveForm from '@/views/cw/projectReportArchive/ProjectReportArchiveForm'
 import noticeService from '@/api/flowable/noticeService'
@@ -208,15 +230,18 @@ import processService from "@/api/flowable/processService.js";
 import print2 from "@/utils/print.js";
 import { shallowRef } from 'vue'
 import CollectService from '@/api/materialManagement/CollectService'
+import PsiCollectService from '@/api/psi/CollectService'
 import WareHouseService from '@/api/materialManagement/WareHouseService'
 import ProjectReportArchiveService from '@/api/cw/projectRecords/ProjectReportArchiveService'
 import pick from "lodash.pick";
 export default {
 	collectService: null,
+	psiCollectService: null,
 	wareHouseService: null,
 	projectReportArchiveService: null,
 	beforeCreate() {
 		this.collectService = new CollectService()
+		this.psiCollectService = new PsiCollectService()
 		this.wareHouseService = new WareHouseService()
 		this.projectReportArchiveService = new ProjectReportArchiveService()
 	},
@@ -314,6 +339,7 @@ export default {
 		FlowStep,
 		FlowTimeLine,
 		CollectReturnHi,
+		PsiCollectReturnHi,
 		ProjectReportArchiveForm,
 		WareHouseHi
 	},
@@ -369,6 +395,7 @@ export default {
 			this.cwArchiveId = this.$route.query.cwArchiveId
 			this.cwArchiveHiFlag = ""
 			this.returnId = this.$route.query.returnId
+			this.psiReturnId = this.$route.query.psiReturnId
 			if (this.commonJS.isEmpty(this.$route.query.isShow)) {
 				this.isShow = 'true'
 			} else {
@@ -1650,6 +1677,16 @@ export default {
 					})
 				}
 			}
+			if (event.props.name === 'form-psi-return') {
+				if (this.commonJS.isNotEmpty(this.psiReturnId)) {
+					this.psiCollectService.findByReturnId(this.psiReturnId).then((data) => {
+						this.psiCollectService.findHiById(data.id).then((data) => {
+							this.dataListHiCollect = data
+						})
+					})
+				}
+			}
+
 			/*if (event.props.name === 'form-cwArchive') {
 				if (this.commonJS.isNotEmpty(this.cwArchiveId)) {
 					this.projectReportArchiveService.findHiById(this.cwArchiveId).then((data) => {
@@ -1675,6 +1712,12 @@ export default {
 			if (this.commonJS.isNotEmpty(row.id)) {
 				this.$refs.collectReturnHi.init(row.id)
 			}
+		},
+		// 打开进销存领用退回历史详情页
+		hiPsiDetailCollect(row) {
+			if (this.commonJS.isNotEmpty(row.id)) {
+				this.$refs.psiCollectReturnHi.init(row.id)
+			}
 		}
 	},
 	data() {
@@ -1720,6 +1763,7 @@ export default {
 			cwArchiveId: '',
 			cwArchiveHiFlag: '',
 			returnId: '',
+			psiReturnId: '',
 			dataListHi: [],
 			dataListHiCollect: [],
 			cwArchiveDataListHiCollect: [],

src/views/flowable/task/TaskFormDetail.vue

@@ -1,54 +1,18 @@
 <template>
 	<div class="jp-center">
 		<h2 class="title">{{ title }}</h2>
-		<img
-			v-if="code === 1"
-			class="process-status-img"
-			src="../../../assets/img/flowable/1.png"
-		/>
-		<img
-			v-if="code === 2"
-			class="process-status-img"
-			src="../../../assets/img/flowable/2.png"
-		/>
-		<img
-			v-if="code === 3"
-			class="process-status-img"
-			src="../../../assets/img/flowable/3.png"
-		/>
-		<img
-			v-if="code === 4"
-			class="process-status-img"
-			src="../../../assets/img/flowable/4.png"
-		/>
-		<img
-			v-if="code === 5"
-			class="process-status-img"
-			src="../../../assets/img/flowable/5.png"
-		/>
-		<img
-			v-if="code === 6"
-			class="process-status-img"
-			src="../../../assets/img/flowable/6.png"
-		/>
+		<img v-if="code === 1" class="process-status-img" src="../../../assets/img/flowable/1.png" />
+		<img v-if="code === 2" class="process-status-img" src="../../../assets/img/flowable/2.png" />
+		<img v-if="code === 3" class="process-status-img" src="../../../assets/img/flowable/3.png" />
+		<img v-if="code === 4" class="process-status-img" src="../../../assets/img/flowable/4.png" />
+		<img v-if="code === 5" class="process-status-img" src="../../../assets/img/flowable/5.png" />
+		<img v-if="code === 6" class="process-status-img" src="../../../assets/img/flowable/6.png" />
 		<el-tabs type="border-card" v-model="selectedTab" @tab-click="onTabChange">
 			<el-tab-pane label="表单信息" name="form-first">
-				<component
-					:formReadOnly="formReadOnly"
-					v-if="formType === '2'"
-					:class="formReadOnly ? 'readonly' : ''"
-					:status="'taskFormDetail'"
-					ref="form"
-					:businessId="businessId"
-					:is="form"
-				></component>
-				<PreviewForm
-					v-if="formType !== '2'"
-					:processDefinitionId="procDefId"
-					:edit="false"
-					:taskFormData="taskFormData"
-					ref="form"
-				/>
+				<component :formReadOnly="formReadOnly" v-if="formType === '2'" :class="formReadOnly ? 'readonly' : ''"
+					:status="'taskFormDetail'" ref="form" :businessId="businessId" :is="form"></component>
+				<PreviewForm v-if="formType !== '2'" :processDefinitionId="procDefId" :edit="false"
+					:taskFormData="taskFormData" ref="form" />
 			</el-tab-pane>
 			<el-tab-pane label="流程信息" v-if="procInsId" name="form-second">
 				<flow-time-line :historicTaskList="historicTaskList" />
@@ -60,89 +24,93 @@
 							<span>流程图</span>
 						</div>
 					</template>
-					<flow-chart
-						ref="chart1"
-						v-if="procInsId"
-						:processInstanceId="procInsId"
-					/>
-					<flow-chart
-						ref="chart2"
-						v-if="!procInsId"
-						:processDefId="procDefId"
-					/>
+					<flow-chart ref="chart1" v-if="procInsId" :processInstanceId="procInsId" />
+					<flow-chart ref="chart2" v-if="!procInsId" :processDefId="procDefId" />
 				</el-card>
 			</el-tab-pane>
 			<el-tab-pane label="流转记录" v-if="procInsId" name="form-forth">
 				<flow-step :historicTaskList="historicTaskList" />
 			</el-tab-pane>
 			<el-tab-pane label="入库修改历史" v-if="wareHouseId" name="form-sixth">
-				<vxe-table
-					border="inner"
-					size="mini"
-					max-height="1000px"
-					:data="dataListHi">
+				<vxe-table border="inner" size="mini" max-height="1000px" :data="dataListHi">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column min-width="120" align="center" title="修改类型" field="updateTradeType">
 						<template #default="scope">
-							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeType)"> {{scope.row.updateTradeType}} </span>
+							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeType)"> {{ scope.row.updateTradeType }}
+							</span>
 							<span v-else> -- </span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="修改商品" field="updateTradeName">
 						<template #default="scope">
-							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeName)"> {{scope.row.updateTradeName}} </span>
+							<span v-if="commonJS.isNotEmpty(scope.row.updateTradeName)"> {{ scope.row.updateTradeName }}
+							</span>
 							<span v-else> -- </span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="修改人" field="updateUser">
 						<template #default="scope">
-							<span v-if="scope.row.endflag === '2'">(创建人) {{scope.row.updateUser}} </span>
-							<span v-else>{{scope.row.updateUser}} </span>
+							<span v-if="scope.row.endflag === '2'">(创建人) {{ scope.row.updateUser }} </span>
+							<span v-else>{{ scope.row.updateUser }} </span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="修改时间" field="createTime"></vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
-						<template  #default="scope">
+						<template #default="scope">
 							<el-button text type="primary" size="small" @click="hiDetail(scope.row)">修改详情</el-button>
 						</template>
 					</vxe-column>
 				</vxe-table>
 			</el-tab-pane>
 			<el-tab-pane label="领用退回历史" v-if="returnId" name="form-seventh">
-				<vxe-table
-					border="inner"
-					size="mini"
-					max-height="1000px"
-					:data="dataListHiCollect">
+				<vxe-table border="inner" size="mini" max-height="1000px" :data="dataListHiCollect">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column min-width="160" align="center" title="退回物品" field="returnGoods">
 						<template #default="scope">
-							<span v-if="commonJS.isNotEmpty(scope.row.returnGoods)"> {{scope.row.returnGoods}} </span>
+							<span v-if="commonJS.isNotEmpty(scope.row.returnGoods)"> {{ scope.row.returnGoods }} </span>
 							<span v-else> -- </span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="退回申请人" field="returnUserName">
 						<template #default="scope">
-							<span>{{scope.row.returnUserName}} </span>
+							<span>{{ scope.row.returnUserName }} </span>
 						</template>
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="退回时间" field="createTime"></vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
-						<template  #default="scope">
-							<el-button text type="primary" size="small" @click="hiDetailCollect(scope.row)">退回详情</el-button>
+						<template #default="scope">
+							<el-button text type="primary" size="small"
+								@click="hiDetailCollect(scope.row)">退回详情</el-button>
+						</template>
+					</vxe-column>
+				</vxe-table>
+			</el-tab-pane>
+			<el-tab-pane label="领用退回历史" v-if="psiReturnId" name="form-psi-return">
+				<vxe-table border="inner" size="mini" max-height="1000px" :data="dataListHiCollect">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="160" align="center" title="退回物品" field="returnGoods">
+						<template #default="scope">
+							<span v-if="commonJS.isNotEmpty(scope.row.returnGoods)"> {{ scope.row.returnGoods }} </span>
+							<span v-else> -- </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="退回申请人" field="returnUserName">
+						<template #default="scope">
+							<span>{{ scope.row.returnUserName }} </span>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="退回时间" field="createTime"></vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template #default="scope">
+							<el-button text type="primary" size="small"
+								@click="hiPsiDetailCollect(scope.row)">退回详情</el-button>
 						</template>
 					</vxe-column>
 				</vxe-table>
 			</el-tab-pane>
 			<el-tab-pane label="修改签字注师历史" v-if="sigId" name="form-eighth">
-				<vxe-table
-					ref="sigTable"
-					border="inner"
-					:key="111"
-					size="small"
-					class="vxe-table-element"
-					max-height="1000px"
-					:data="sigHiCollect">
+				<vxe-table ref="sigTable" border="inner" :key="111" size="small" class="vxe-table-element"
+					max-height="1000px" :data="sigHiCollect">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column min-width="160" align="center" title="签字注师1" field="signatureAnnotator1"></vxe-column>
 					<vxe-column min-width="160" align="center" title="签字注师2" field="signatureAnnotator2"></vxe-column>
@@ -154,6 +122,7 @@
 		</el-tabs>
 		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
+		<PsiCollectReturnHi ref="psiCollectReturnHi"></PsiCollectReturnHi>
 	</div>
 </template>
 
@@ -169,14 +138,18 @@ import processService from "@/api/flowable/processService.js";
 import { shallowRef } from 'vue'
 import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
 import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
+import PsiCollectReturnHi from '@/views/psiManagement/collect/CollectReturnHiForm'
 import CollectService from '@/api/materialManagement/CollectService'
+import PsiCollectService from '@/api/psi/CollectService'
 import WareHouseService from '@/api/materialManagement/WareHouseService'
 import projectReportService from '@/api/cw/reportManagement/ProjectReportService'
 export default {
 	collectService: null,
+	psiCollectService: null,
 	wareHouseService: null,
-	beforeCreate () {
+	beforeCreate() {
 		this.collectService = new CollectService()
+		this.psiCollectService = new PsiCollectService()
 		this.wareHouseService = new WareHouseService()
 	},
 	activated() {
@@ -230,7 +203,8 @@ export default {
 		FlowStep,
 		FlowTimeLine,
 		WareHouseHi,
-		CollectReturnHi
+		CollectReturnHi,
+		PsiCollectReturnHi
 		// FlowChart
 	},
 	watch: {
@@ -258,8 +232,9 @@ export default {
 			this.businessId = this.$route.query.businessId;
 			this.procInsId = this.$route.query.procInsId;
 			this.returnId = this.$route.query.returnId
+			this.psiReturnId = this.$route.query.psiReturnId
 			this.wareHouseId = this.$route.query.wareHouseId
-			this.sigId=this.$route.query.sigId
+			this.sigId = this.$route.query.sigId
 			this.formReadOnly = true;
 			let _this = this
 			setTimeout(function () {
@@ -270,7 +245,7 @@ export default {
 				}
 			}, 500)
 		},
-		onTabChange (event) {
+		onTabChange(event) {
 			if (event.props.name === 'form-sixth') {
 				if (this.commonJS.isNotEmpty(this.wareHouseId)) {
 					this.wareHouseService.findHiById(this.wareHouseId).then((data) => {
@@ -288,26 +263,41 @@ export default {
 					})
 				}
 			}
+			if (event.props.name === 'form-psi-return') {
+				if (this.commonJS.isNotEmpty(this.psiReturnId)) {
+					this.psiCollectService.findByReturnId(this.psiReturnId).then((data) => {
+						this.psiCollectService.findHiById(data.id).then((data) => {
+							this.dataListHiCollect = data
+						})
+					})
+				}
+			}
 			if (event.props.name === 'form-eighth') {
 				if (this.commonJS.isNotEmpty(this.sigId)) {
 					projectReportService.findByReportId(this.sigId).then((data) => {
-						console.log('data',data)
+						console.log('data', data)
 						this.sigHiCollect = data
 					})
 				}
 			}
 		},
 		// 打开入库修改历史详情页
-		hiDetail (row) {
+		hiDetail(row) {
 			if (this.commonJS.isNotEmpty(row.id)) {
 				this.$refs.wareHouseHi.init(row.id)
 			}
 		},
 		// 打开领用退回历史详情页
-		hiDetailCollect (row) {
+		hiDetailCollect(row) {
 			if (this.commonJS.isNotEmpty(row.id)) {
 				this.$refs.collectReturnHi.init(row.id)
 			}
+		},
+		// 打开进销存领用退回历史详情页
+		hiPsiDetailCollect(row) {
+			if (this.commonJS.isNotEmpty(row.id)) {
+				this.$refs.psiCollectReturnHi.init(row.id)
+			}
 		}
 	},
 	data() {
@@ -329,11 +319,12 @@ export default {
 			title: "",
 			businessId: "",
 			returnId: "",
+			psiReturnId: '',
 			wareHouseId: '',
 			dataListHi: [],
 			dataListHiCollect: [],
-			sigId:'',
-			sigHiCollect:[],
+			sigId: '',
+			sigHiCollect: [],
 		};
 	},
 };
@@ -344,10 +335,12 @@ export default {
 	position: relative;
 	padding: 10px;
 }
+
 .title {
 	padding: 15px;
 	text-align: center;
 }
+
 .process-status-img {
 	height: 180px;
 	position: absolute;

src/views/psiManagement/collect/CollectList.vue

@@ -531,7 +531,7 @@ export default {
 						isShow: 'false',
 						status: status,
 						routePath: '/psiManagement/collect/CollectList',
-						returnId: row.returnId
+						psiReturnId: row.returnId
 					}
 				})
 			})
@@ -553,7 +553,8 @@ export default {
 							formTitle: '领用-退回申请' + '流程详情',
 							businessId: row.returnId,
 							status: 'reback',
-							returnId: row.returnId
+							psiReturnId: row.returnId
+
 						}
 					})
 				})