From 51da6197145e71c067a4a12d39931c63eccdf25a Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 10 八月 2022 10:07:03 +0800
Subject: [PATCH] 对接
---
src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue | 16 +++++++++-------
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue | 1 +
src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue | 4 ++++
src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue | 8 +++++---
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue | 1 +
src/views/goalManagement/targetSettings/component/dailogAdd.vue | 2 +-
src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue | 4 ++++
7 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
index 3137291..a241308 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/component/openAdd.vue
@@ -138,6 +138,8 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
+ delete ruleForm.value.suppliesName
+ delete ruleForm.value.userName
emergencyMaterialsInspectionApi()
.addEmergencyMaterialsInspection(ruleForm.value)
.then((res) => {
@@ -167,6 +169,8 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
+ delete ruleForm.value.suppliesName
+ delete ruleForm.value.userName
emergencyMaterialsInspectionApi()
.editEmergencyMaterialsInspection(ruleForm.value)
.then((res) => {
diff --git a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue
index 5e14343..2e31c2e 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue
@@ -4,7 +4,7 @@
<div class="system-user-search mb15">
<el-form size="default" label-width="80px" :inline="true">
<el-form-item prop="telephone">
- <el-input v-model="listQuery.searchParams.suppliesName" placeholder="请选择应急物资" class="input-with-select">
+ <el-input v-model="suppliesName" placeholder="请选择应急物资" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="daiInpt" />
</template>
@@ -143,10 +143,11 @@
});
}
};
+ const suppliesName=ref()
// 重置
const submitReset = () => {
listQuery.searchParams.suppliesId = '';
- listQuery.searchParams.suppliesName=""
+ suppliesName.value=""
onSubmit();
};
const warning = ref(true);
@@ -266,7 +267,7 @@
};
const onUser = (e: any) => {
listQuery.searchParams.suppliesId = e.id;
- listQuery.searchParams.suppliesName=e.name
+ suppliesName.value=e.name
};
// 分页
const pageIndex = ref();
@@ -287,6 +288,7 @@
onSubmit();
});
return {
+ suppliesName,
upButton,
upShow,
Edit,
diff --git a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
index 0953d51..d67642c 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/inspect.vue
@@ -121,6 +121,7 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
+ delete ruleForm.value.userName
emergencyMaterialsInspectionApi()
.addEmergencyMaterialsInspection(ruleForm.value)
.then((res) => {
diff --git a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue
index b30bcc2..fb8b0a1 100644
--- a/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue
+++ b/src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue
@@ -120,6 +120,7 @@
await formEl.validate((valid, fields) => {
if (valid) {
isShowDialog.value = false;
+ delete ruleForm.value.userName
maintenanceEmergencyMaterialsApi()
.addMaintenanceEmergencyMaterials(ruleForm.value)
.then((res) => {
diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue
index 7bcfdce..fd30fbe 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue
@@ -113,6 +113,8 @@
if (valid) {
if (titles.value == '新建应急物资保养') {
isShowDialog.value = false;
+ delete ruleForm.value.suppliesName
+ delete ruleForm.value.userName
maintenanceEmergencyMaterialsApi()
.addMaintenanceEmergencyMaterials(ruleForm.value)
.then((res) => {
@@ -134,6 +136,8 @@
});
} else if (titles.value == '修改应急物资保养') {
isShowDialog.value = false;
+ delete ruleForm.value.suppliesName
+ delete ruleForm.value.userName
maintenanceEmergencyMaterialsApi()
.editMaintenanceEmergencyMaterials(ruleForm.value)
.then((res) => {
diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
index 3544d06..f45019b 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
@@ -4,7 +4,7 @@
<div class="system-user-search mb15">
<el-form size="default" label-width="80px" :inline="true">
<el-form-item prop="telephone">
- <el-input v-model="listQuery.searchParams.suppliesName" placeholder="请选择应急物资" class="input-with-select">
+ <el-input v-model="suppliesName" placeholder="请选择应急物资" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="daiInpt" />
</template>
@@ -148,10 +148,11 @@
});
}
};
+ const suppliesName = ref('');
// 重置
const submitReset = () => {
listQuery.searchParams.suppliesId = '';
- listQuery.searchParams.suppliesName="";
+ suppliesName.value = '';
onSubmit();
};
const warning = ref(true);
@@ -163,7 +164,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr
+ deletAll.value = arr;
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -178,7 +179,7 @@
// 打开新建用户弹窗
const addRef = ref();
- const onOpenAdd = (data:any) => {
+ const onOpenAdd = (data: any) => {
addRef.value.openDialog(data);
};
// 新增后刷新
@@ -199,8 +200,8 @@
};
// 删除
const onRowDel = (data: any) => {
- let arr=[]
- arr.push(data)
+ let arr = [];
+ arr.push(data);
ElMessageBox.confirm('确定删除所选项吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -271,7 +272,7 @@
};
const onUser = (e: any) => {
listQuery.searchParams.suppliesId = e.id;
- listQuery.searchParams.suppliesName=e.name
+ suppliesName.value = e.name;
};
// 分页
const pageIndex = ref();
@@ -292,6 +293,7 @@
onSubmit();
});
return {
+ suppliesName,
upButton,
upShow,
Edit,
diff --git a/src/views/goalManagement/targetSettings/component/dailogAdd.vue b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
index f0fdef8..721fe7e 100644
--- a/src/views/goalManagement/targetSettings/component/dailogAdd.vue
+++ b/src/views/goalManagement/targetSettings/component/dailogAdd.vue
@@ -38,7 +38,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="完成期限" size="default" prop="completeDate">
- <el-date-picker v-model="form.completeDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+ <el-date-picker v-model="form.completeDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.2