yangg 1 ماه پیش
والد
کامیت
7cca679a9b

+ 24 - 1
src/views/system/borrow/approval/SpecialBorrowApp/index.vue

@@ -139,6 +139,25 @@
 			</el-upload> -->
 		    </div>
 
+			<!-- 续借信息(仅查看模式展示) -->
+			<div v-if="isView && form.latest_renewal" style="margin-top: 8px;">
+				<div style="font-weight: bold; margin-bottom: 8px">续借信息</div>
+				<el-row :gutter="16">
+					<el-col :span="4">
+						<el-form-item label="续借天数">
+							<el-input :model-value="form.latest_renewal?.renewal_days" :disabled="true">
+								<template #append>天</template>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="21">
+						<el-form-item label="续借理由">
+							<el-input :model-value="form.latest_renewal?.renewal_reason" type="textarea" :disabled="true" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</div>
+
 		</el-form>
 		<!-- 审批信息流程展示 -->
 		<div v-if="isView"  style="margin-top: 24px; padding: 0 12px">
@@ -416,7 +435,11 @@ const form = ref({
 	borrow_type: 2,
 	return_location:'',
 	attachments:'',
-	admin_borrower:''
+	admin_borrower:'',
+	latest_renewal: {
+		renewal_days: '',
+		renewal_reason: ''
+	}
 });
 const showSelectDeviceDialog = ref(false);
 

+ 22 - 0
src/views/system/borrow/component/CollectEquipment/index.vue

@@ -146,7 +146,25 @@
                     >
                     <el-icon><Plus /></el-icon>
                     </el-upload>
+                    <div v-if="isView && form.latest_renewal" style="margin-top: 8px;">
+                    <div style="font-weight: bold; margin-bottom: 8px">续借信息</div>
+                    <el-row :gutter="16">
+                      <el-col :span="4">
+                        <el-form-item label="续借天数">
+                          <el-input :model-value="form.latest_renewal?.renewal_days" :disabled="true">
+                            <template #append>天</template>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="21">
+                        <el-form-item label="续借理由">
+                          <el-input :model-value="form.latest_renewal?.renewal_reason" type="textarea" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </div>
                 </el-form>
+                
                 <!-- 审批信息流程展示 -->
                 <!-- <div v-if="isView"  style="margin-top: 24px; padding: 0 12px">
                 <div style="font-weight: bold; margin-bottom: 12px">审批流程进度</div>
@@ -503,6 +521,10 @@ interface FormData {
   };
   borrower_damage_count?: number;
   accessories?: string;
+  latest_renewal?: {
+    renewal_days?: number | string;
+    renewal_reason?: string;
+  };
 }
 
 interface AbnormalData {