瀏覽代碼

no message

kllay 2 天之前
父節點
當前提交
4ee636dff1

+ 33 - 32
src/views/system/borrow/approval/BorrowApprovalDialog/index.vue

@@ -4,7 +4,11 @@
         <p><strong>申请编号:</strong>{{ approvalData.application_no }}</p>
         <p><strong>借用人:</strong>{{ approvalData.emergency_contact }}</p>
         <p><strong>课程:</strong>{{ approvalData.purpose }}</p>
-        <!-- 可继续展示更多字段 -->
+        <p><strong>学号/工号:</strong>{{ approvalData.borrower_info.user_code }}</p>
+        <p><strong>联系方式:</strong>{{ approvalData.emergency_phone }}</p>
+        <p><strong>个人/团队:</strong>{{ approvalData.team_type_label }}</p>
+        <p><strong>归还时间:</strong>{{ approvalData.expected_end_time }}</p>
+        <p><strong>存放仓库:</strong>{{ approvalData.return_location }}</p>
         </div>
     
         <div v-if="showRejectReason" style="margin-top: 16px;">
@@ -17,7 +21,7 @@
         </div>
     
         <template #footer>
-        <el-button @click="approvalDialogVisible = false">取消</el-button>
+        <el-button @click="approvalDialogVisible = false">关闭</el-button>
         <el-button type="danger" @click="handleReject">拒绝</el-button>
         <el-button type="primary" @click="handleApprove">通过</el-button>
         </template>
@@ -26,22 +30,15 @@
 
 <script lang="ts" setup name="BorrowApprovalDialog" >
 import { ref } from 'vue';
-
+import { BorrowingReview } from '../api';
+import { ElMessage } from 'element-plus';
 const approvalDialogVisible = ref(false);
 const approvalData = ref<any>({});
 const showRejectReason = ref(false);
 const rejectReason = ref('');
 
 
-const visible = ref(false);
-const currentRow = ref({});
-
-function open(row) {
-  currentRow.value = row;
-  visible.value = true;
-}
 
-defineExpose({ open });
 
 
 function openApprovalDialog(row) {
@@ -51,34 +48,38 @@ function openApprovalDialog(row) {
   rejectReason.value = '';
 }
 
+defineExpose({ openApprovalDialog });
+
+
+
 async function handleApprove() {
   try {
-    await BorrowingReview(approvalData.value.id, 'approve', '同意借用');
-    ElMessage.success('审批通过');
-    approvalDialogVisible.value = false;
-  } catch (err) {
-    ElMessage.error('审批失败');
-  }
+        await BorrowingReview(approvalData.value.id, 'approve', '同意借用');
+        ElMessage.success('审批通过');
+        approvalDialogVisible.value = false;
+    } catch (err) {
+        ElMessage.error('审批失败');
+    }
 }
 
 function handleReject() {
-  if (!showRejectReason.value) {
-    showRejectReason.value = true;
-    return;
-  }
+    if (!showRejectReason.value) {
+        showRejectReason.value = true;
+        return;
+    }
 
-  if (!rejectReason.value.trim()) {
-    ElMessage.warning('请填写拒绝原因');
-    return;
-  }
+    if (!rejectReason.value.trim()) {
+        ElMessage.warning('请填写拒绝原因');
+        return;
+    }
 
-  try {
-    BorrowingReview(approvalData.value.id, 'reject', rejectReason.value);
-    ElMessage.success('已拒绝');
-    approvalDialogVisible.value = false;
-  } catch (err) {
-    ElMessage.error('拒绝失败');
-  }
+    try {
+        BorrowingReview(approvalData.value.id, 'reject', rejectReason.value);
+        ElMessage.success('审批拒绝');
+        approvalDialogVisible.value = false;
+    } catch (err) {
+        ElMessage.error('拒绝失败');
+    }
 }
 
 

+ 23 - 27
src/views/system/borrow/approval/curd.tsx

@@ -76,7 +76,7 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 						// console.log("click", context);
 						// alert(context);
 						try{
-							approvalDialogRef.value.open(row);
+							approvalDialogRef.value.openApprovalDialog(row);
 							// BorrowingReview(context.row.id,'approve','同意借用');
 							// ElMessage.success('审批通过');
 						}catch(err){
@@ -124,7 +124,7 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					form: {
 						show: false,
 						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						rules: [{ required: false, message: '请输入借用性质' }],
 					},
 				},
 				"borrower_info.user_code": {
@@ -134,8 +134,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入学号/工号' },
+						rules: [{ required: false, message: '请输入学号/工号' }],
 					},
 				},
 				"borrower_info.name": {
@@ -145,25 +145,21 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入借用' },
+						rules: [{ required: false, message: '请输入借用' }],
 					},
 				},
-				"borrower_info.id": {
-					title: '联系电话',
+				emergency_phone: {
+					title: '联系方式',
 					search: { show: false },
-					type: 'dict-select',
+					type: 'input',
 					column: {
 						minWidth: 120
 					},
-					dict: dict({
-						url: "/api/system/app_user/", 
-						value: 'id', 
-						label: 'mobile' }),
 					form: {
 						show: false,
-						component: { placeholder: '请输入联系电话' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入联系方式' },
+						rules: [{ required: false, message: '请输入联系方式' }],
 					}
 
 				},
@@ -174,8 +170,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入个人/团队' },
+						rules: [{ required: false, message: '请输入个人/团队' }],
 					},
 				},
 				expected_start_time: {
@@ -185,8 +181,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入创建时间' },
+						rules: [{ required: false, message: '请输入创建时间' }],
 					},
 				},
 				expected_end_time: {
@@ -196,8 +192,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入预计归还时间' },
+						rules: [{ required: false, message: '请输入预计归还时间' }],
 					},
 				},
 				status_label: {
@@ -207,8 +203,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入当前状态' },
+						rules: [{ required: false, message: '请输入当前状态' }],
 					},
 				},
 				status: {
@@ -218,8 +214,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入当前审批人' },
+						rules: [{ required: false, message: '请输入当前审批人' }],
 					},
 				},
 				return_location: {
@@ -229,8 +225,8 @@ export const createCrudOptions = function ({ crudExpose ,approvalDialogRef}: Cre
 					column: { minWidth: 120 },
 					form: {
 						show: false,
-						component: { placeholder: '请输入借用性质' },
-						rules: [{ required: false, message: '请输入借用编号' }],
+						component: { placeholder: '请输入存放仓库' },
+						rules: [{ required: false, message: '请输入存放仓库' }],
 					},
 				},
 		

+ 4 - 2
src/views/system/borrow/approval/index.vue

@@ -13,9 +13,11 @@ import BorrowApprovalDialog from './BorrowApprovalDialog/index.vue';
 
 const approvalDialogRef = ref();
 
-const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
+// const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions });
 
-createCrudOptions({ crudExpose, approvalDialogRef });
+const { crudExpose, crudBinding } = useFs({
+  createCrudOptions: (props) => createCrudOptions({ ...props, approvalDialogRef })
+});