From cb320fe318c65017ca94108c4090d39afeee6d7a Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Tue, 02 Aug 2022 11:07:54 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
index 1e2b0c7..fb47da5 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
@@ -70,7 +70,7 @@
</span>
</template>
</el-dialog>
- <Material ref="showRef"/>
+ <EmergencySupplies ref="showRef" @SearchUser="onUser"/>
<userSelections ref="userRef"/>
</div>
</template>
@@ -90,7 +90,7 @@
Search,
FullScreen,
} from '@element-plus/icons-vue'
-import Material from '/@/components/material/index.vue'
+import EmergencySupplies from '/@/components/emergencySupplies/index.vue'
import UserSelections from "/@/components/userSelections/index.vue"
import {emergencyMaterialsInspectionApi} from "/@/api/emergencyMaterialsInspection";
import {maintenanceEmergencyMaterialsApi} from "/@/api/maintenanceEmergencyMaterials";
@@ -99,7 +99,7 @@
name: 'openAdd',
components: {
UserSelections,
- Material,
+ EmergencySupplies,
},
setup(props, { emit }) {
const isShowDialog = ref(false)
@@ -145,8 +145,8 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
- maintenanceEmergencyMaterialsApi()
- .addMaintenanceEmergencyMaterials(ruleForm.value)
+ emergencyMaterialsInspectionApi()
+ .addEmergencyMaterialsInspection(ruleForm.value)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -175,8 +175,8 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
- maintenanceEmergencyMaterialsApi()
- .editMaintenanceEmergencyMaterials(ruleForm.value)
+ emergencyMaterialsInspectionApi()
+ .editEmergencyMaterialsInspection(ruleForm.value)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -225,6 +225,9 @@
const daiInpt=()=>{
showRef.value.openDailog()
}
+ const onUser = (e:any) => {
+ ruleForm.value.suppliesId=e.id
+ };
// 编写人弹窗
const userRef = ref();
const openUser = () => {
@@ -258,6 +261,7 @@
titles,
disabled,
emit,
+ onUser,
};
},
});
--
Gitblit v1.9.2