From 485e89eed73a37c78a4823f9e77bfcdbdaa01fe2 Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期三, 10 八月 2022 10:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
index b535229..d67642c 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
@@ -14,7 +14,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="保养结果" prop="inspectResult">
+						<el-form-item label="检查结果" prop="inspectResult">
 							<el-select v-model="ruleForm.inspectResult" class="w100" placeholder="请选择">
 								<el-option label="正常" value="1"></el-option>
 								<el-option label="异常" value="2"></el-option>
@@ -63,7 +63,7 @@
 import { Search, FullScreen } from '@element-plus/icons-vue';
 import EmergencySupplies from '/@/components/emergencySupplies/index.vue';
 import UserSelections from '/@/components/userSelections/index.vue';
-import { emergencyMaterialsInspectionApi } from '/@/api/emergencyMaterialsInspection';
+import { emergencyMaterialsInspectionApi } from '/@/api/contingencyManagement/emergencyMaterialsInspection';
 
 export default defineComponent({
 	name: 'inspect',
@@ -121,6 +121,7 @@
 			await formEl.validate((valid, fields) => {
 				if (valid) {
 					isShowDialog.value = false;
+					delete ruleForm.value.userName
 					emergencyMaterialsInspectionApi()
 						.addEmergencyMaterialsInspection(ruleForm.value)
 						.then((res) => {

--
Gitblit v1.9.2