|
@@ -53,7 +53,7 @@
|
|
:title="modalType == 'add' ? '添加' : '编辑'"
|
|
:title="modalType == 'add' ? '添加' : '编辑'"
|
|
v-model="dialogVisible"
|
|
v-model="dialogVisible"
|
|
width="500"
|
|
width="500"
|
|
- v-loading="loading"
|
|
|
|
|
|
+ v-loading="loadingOne"
|
|
>
|
|
>
|
|
<byForm
|
|
<byForm
|
|
:formConfig="formConfig"
|
|
:formConfig="formConfig"
|
|
@@ -295,6 +295,8 @@ import { computed, defineComponent, ref } from "vue";
|
|
let openProduct = ref(false);
|
|
let openProduct = ref(false);
|
|
|
|
|
|
const loading = ref(false);
|
|
const loading = ref(false);
|
|
|
|
+const loadingOne = ref(false);
|
|
|
|
+
|
|
const submitLoading = ref(false);
|
|
const submitLoading = ref(false);
|
|
const sourceList = ref({
|
|
const sourceList = ref({
|
|
data: [],
|
|
data: [],
|
|
@@ -731,8 +733,10 @@ const select = (_selection, row) => {
|
|
};
|
|
};
|
|
|
|
|
|
const tree = ref(null);
|
|
const tree = ref(null);
|
|
|
|
+let submitProductData = ref({});
|
|
const submitForm = () => {
|
|
const submitForm = () => {
|
|
byform.value.handleSubmit((valid) => {
|
|
byform.value.handleSubmit((valid) => {
|
|
|
|
+ submitProductData.value = { ...formData.data };
|
|
const list = formData.data.productCombinationList;
|
|
const list = formData.data.productCombinationList;
|
|
let jsonObj = JSON.parse(formData.data.victoriatouristJson);
|
|
let jsonObj = JSON.parse(formData.data.victoriatouristJson);
|
|
if (formData.data.combination == 1) {
|
|
if (formData.data.combination == 1) {
|
|
@@ -751,6 +755,7 @@ const submitForm = () => {
|
|
type: "info",
|
|
type: "info",
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+ loadingOne.value = true;
|
|
jsonObj.deptId = deptIdCopy.value;
|
|
jsonObj.deptId = deptIdCopy.value;
|
|
formData.data.victoriatouristJson = jsonObj;
|
|
formData.data.victoriatouristJson = jsonObj;
|
|
jsonObj.productCombinationList = list;
|
|
jsonObj.productCombinationList = list;
|
|
@@ -772,10 +777,17 @@ const submitForm = () => {
|
|
type: "success",
|
|
type: "success",
|
|
});
|
|
});
|
|
dialogVisible.value = false;
|
|
dialogVisible.value = false;
|
|
|
|
+ loadingOne.value = false;
|
|
|
|
+
|
|
submitLoading.value = false;
|
|
submitLoading.value = false;
|
|
getList();
|
|
getList();
|
|
},
|
|
},
|
|
(err) => {
|
|
(err) => {
|
|
|
|
+ formData.data = { ...submitProductData.value };
|
|
|
|
+ formData.data.victoriatouristJson = JSON.parse(
|
|
|
|
+ submitProductData.value.victoriatouristJson
|
|
|
|
+ );
|
|
|
|
+ loadingOne.value = false;
|
|
submitLoading.value = false;
|
|
submitLoading.value = false;
|
|
}
|
|
}
|
|
);
|
|
);
|