瀏覽代碼

修改内容

qaz 5 天之前
父節點
當前提交
e703000d01

+ 9 - 4
src/utils/request.ts

@@ -35,7 +35,7 @@ service.interceptors.response.use(
 	(response) => {
 		// 对响应数据做点什么
 		const res = response.data;
-		if (res.code && res.code !== 0) {
+		if (res.code && res.code !== 2000) {
 			// `token` 过期或者账号已在别处登录
 			if (res.code === 401 || res.code === 4001) {
 				Session.clear(); // 清除浏览器全部临时缓存
@@ -44,7 +44,7 @@ service.interceptors.response.use(
 					.then(() => {})
 					.catch(() => {});
 			}
-			return Promise.reject(service.interceptors.response);
+			return Promise.reject(res);
 		} else {
 			return response.data;
 		}
@@ -56,8 +56,13 @@ service.interceptors.response.use(
 		} else if (error.message == 'Network Error') {
 			ElMessage.error('网络连接错误');
 		} else {
-			if (error.response.data) ElMessage.error(error.response.statusText);
-			else ElMessage.error('接口路径找不到');
+			if (error.response?.data?.message) {
+				ElMessage.error(error.response.data.message);
+			} else if (error.response?.statusText) {
+				ElMessage.error(error.response.statusText);
+			} else {
+				ElMessage.error('接口请求失败');
+			}
 		}
 		return Promise.reject(error);
 	}

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

@@ -888,9 +888,9 @@ watch(() => props.modelValue, async (val) => {
                     // 添加损坏类型记录
                     const damageRecord: AbnormalRecord = {
                         application_no: form.value.application_no,
-                        operator_name: form.value.emergency_contact||form.value.app_user_borrower.name,
-                        user_code: form.value.borrower_info?.user_code || form.value.app_user_borrower.user_code,
-                        emergency_phone: form.value.emergency_phone || form.value.app_user_borrower.mobile,
+                        operator_name: form.value.external_borrower_name||form.value.app_user_borrower?.name||'',
+                        user_code: form.value.borrower_info?.user_code || form.value.app_user_borrower?.user_code||'',
+                        emergency_phone: form.value.external_borrower_phone || form.value.app_user_borrower?.mobile||'',
                         type: '损坏',
                         condition: form.value.borrower_damage_count || 0,
                         create_time: dayjs().format('YYYY-MM-DD HH:mm:ss')
@@ -899,9 +899,9 @@ watch(() => props.modelValue, async (val) => {
                     // 添加逾期类型记录
                     const overdueRecord: AbnormalRecord = {
                         application_no: form.value.application_no,
-                        operator_name: form.value.emergency_contact||form.value.app_user_borrower.name,
-                        user_code: form.value.borrower_info?.user_code || form.value.app_user_borrower.user_code,
-                        emergency_phone: form.value.emergency_phone || form.value.app_user_borrower.mobile,
+                        operator_name: form.value.external_borrower_name||form.value.app_user_borrower?.name||'',
+                        user_code: form.value.borrower_info?.user_code || form.value.app_user_borrower?.user_code||'',
+                        emergency_phone: form.value.external_borrower_phone || form.value.app_user_borrower?.mobile||'',
                         type: '逾期',
                         condition: form.value.borrower_overdue_count || 0, // 逾期数量设为1
                         create_time: dayjs().format('YYYY-MM-DD HH:mm:ss')

+ 3 - 3
src/views/system/borrow/crud.tsx

@@ -52,9 +52,9 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					edit: {
 						show:true,	
 						order:4,
-						/* disabled:compute( ({row})=>{
-							return row.borrow_type === 0;
-						}), */ 
+						disabled:compute( ({row})=>{
+							return row.status == 7;
+						}), 
 						click: ({ row }) => {
 							window.dispatchEvent(new CustomEvent('borrow-edit', { detail: row }));
 						}