diff --git a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addFlow.vue b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addFlow.vue
index 9e82df97345d18d1a1da737a6ea599e1b61722da..92229d0cae190231c0acb7f2984ccaac9a14a41d 100644
--- a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addFlow.vue
+++ b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addFlow.vue
@@ -112,7 +112,9 @@ export default {
this.form.id && this.$delete(this.form, "id");
},
onEdit(data) {
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.form = { ...data };
+ });
},
handleReset() {
this.$refs.form.resetFields();
@@ -125,5 +127,4 @@ export default {
};
</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addPursuant.vue b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addPursuant.vue
index 533db4782cf69b3ca7acf433bdda53c95743b4ed..60b7f1e039085a9041c22f06deda2c1d10775b4b 100644
--- a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addPursuant.vue
+++ b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addPursuant.vue
@@ -154,7 +154,9 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.form = { ...data };
+ });
},
// 鍏抽棴瀵硅瘽妗�
handleClose() {
@@ -178,4 +180,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue
index c1a630b17796dfda0e48dfe1600bf7b77820c0f1..cca560130a23c7c9e489beb6ce7c5970dc35a435 100644
--- a/base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue
+++ b/base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue
@@ -471,7 +471,9 @@ export default {
};
});
}
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.form = { ...data };
+ });
},
// 杩囨护闄勪欢鏁扮粍
filterArr(arr, file) {
@@ -525,4 +527,4 @@ export default {
.upload-file {
display: block;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
index e6d01eec4e42e278871a939ed53c5e58b4dd9d87..4d707d43ec2af34a684da08a933cfa224b2ca37c 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
@@ -143,7 +143,7 @@
}"
>
<a-space size="middle">
- <a-button @click="onClose"> 鍙栨秷 </a-button>
+ <a-button @click="resetForm"> 閲嶇疆 </a-button>
<a-button type="primary" @click="onSubmit"> 纭畾 </a-button>
</a-space>
</div>
@@ -269,8 +269,14 @@ export default {
onClose() {
this.$refs.form.resetFields();
this.fileList = [];
+ this.iconFileList = [];
this.Visible = false;
},
+ resetForm() {
+ this.fileList = [];
+ this.iconFileList = [];
+ this.$refs.form.resetFields();
+ },
// 鎻愪氦
onSubmit() {
this.$refs.form.validate(async (valid) => {
@@ -302,15 +308,6 @@ export default {
},
// 涓婁紶鍥炬爣
handleChangeIcon({ fileList }) {
- // if (info.file.status === "uploading") {
- // this.loading = true;
- // return;
- // }
- // if (info.file.status === "done") {
- // this.form.appIconPath = info.file.response.url;
- // this.loading = false;
- // }
-
this.iconFileList = [...fileList].slice(-1);
this.iconFileList = this.iconFileList.map((v) => {
if (v.response) {
@@ -358,25 +355,28 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.form = { ...data };
- this.fileList = [
- {
- uid: "-1",
- name: this.form.fileName,
- status: "done",
- url: this.form.filePath,
- },
- ];
- this.iconFileList = [
- {
- uid: "-2",
- name: this.form.appIconPath,
- status: "done",
- url: this.api2 + this.form.appIconPath,
- url2: this.form.appIconPath,
- },
- ];
+ this.$nextTick(() => {
+ this.form = { ...data };
+ this.fileList = [
+ {
+ uid: "-1",
+ name: this.form.fileName,
+ status: "done",
+ url: this.form.filePath,
+ },
+ ];
+ this.iconFileList = [
+ {
+ uid: "-2",
+ name: this.form.appIconPath,
+ status: "done",
+ url: this.api2 + this.form.appIconPath,
+ url2: this.form.appIconPath,
+ },
+ ];
+ });
},
+
// 閫変腑绔欑偣
changeSite(value, label) {
this.form.siteName = label[0];
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
index eea398cd90462b9c1208ab6e8b72992c200abf9e..298d254931232131ed29c7d7364150901cfea99d 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
@@ -150,7 +150,7 @@
</a-form-model-item>
</a-form-model>
<div slot="footer">
- <a-button @click="handleCancel">鍙栨秷</a-button>
+ <a-button @click="handleReset">閲嶇疆</a-button>
<a-button type="primary" @click="handleOk">纭畾</a-button>
</div>
</a-modal>
@@ -259,10 +259,10 @@ export default {
fieldCode: "", // 瀛楁缂栫爜
fieldName: "", // 瀛楁鍚嶇О
fieldType: undefined, //瀛楁绫诲瀷锛坕nput.鍗曡杈撳叆妗�,textarea.澶氳杈撳叆妗�,SELECT.涓嬫媺閫夐」妗�,date.鏃ユ湡閫夋嫨妗嗭級
- dataType: "", // 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
+ dataType: "string", // 鏁版嵁绫诲瀷锛坣umber.鏁板瓧,string.瀛楃涓诧級
fieldLen: 128, //鏁版嵁闀垮害锛岄粯璁�128
- fieldNull: "", //鏄惁鍏佽涓虹┖锛�(0.鍚�,1.鏄�)
- isList: "", //瀛楁鏄惁鍒楄〃鏄剧ず(0.鍚�,1.鏄�)
+ fieldNull: 0, //鏄惁鍏佽涓虹┖锛�(0.鍚�,1.鏄�)
+ isList: 0, //瀛楁鏄惁鍒楄〃鏄剧ず(0.鍚�,1.鏄�)
fieldOrderNo: 99, // 鎺掑簭鍙�
fieldTypeValue: "", // 瀛楁绫诲瀷鍊�
defaultValue: "", // 瀛楁榛樿鍊�
@@ -363,7 +363,7 @@ export default {
});
},
handleCancel() {
- this.$refs.form.clearValidate();
+ this.$refs.form.resetFields();
this.fieldType = [
{
key: "",
@@ -378,6 +378,21 @@ export default {
];
this.Visible = false;
},
+ handleReset() {
+ this.$refs.form.resetFields();
+ this.fieldType = [
+ {
+ key: "",
+ value: "",
+ },
+ ];
+ this.apiParams = [
+ {
+ key: "",
+ value: "",
+ },
+ ];
+ },
// 鏂板
onAdd() {
Object.assign(this.form, this.$options.data().form);
@@ -387,40 +402,42 @@ export default {
},
// 缂栬緫
onEdit(data) {
- if (data.fieldTypeValue) {
- let fieldTypeObj = JSON.parse(data.fieldTypeValue);
- this.fieldType = Object.keys(fieldTypeObj).map((key) => {
- return {
- key,
- value: fieldTypeObj[key],
- };
- });
- } else {
- this.fieldType = [
- {
- key: "",
- value: "",
- },
- ];
- }
- if (data.serviceApiParams) {
- let apiParamsObj = JSON.parse(data.serviceApiParams);
- this.apiParams = Object.keys(apiParamsObj).map((key) => {
- return {
- key,
- value: apiParamsObj[key],
- };
- });
- } else {
- this.apiParams = [
- {
- key: "",
- value: "",
- },
- ];
- }
- this.form = { ...data };
- this.getTempleteList();
+ this.$nextTick(() => {
+ if (data.fieldTypeValue) {
+ let fieldTypeObj = JSON.parse(data.fieldTypeValue);
+ this.fieldType = Object.keys(fieldTypeObj).map((key) => {
+ return {
+ key,
+ value: fieldTypeObj[key],
+ };
+ });
+ } else {
+ this.fieldType = [
+ {
+ key: "",
+ value: "",
+ },
+ ];
+ }
+ if (data.serviceApiParams) {
+ let apiParamsObj = JSON.parse(data.serviceApiParams);
+ this.apiParams = Object.keys(apiParamsObj).map((key) => {
+ return {
+ key,
+ value: apiParamsObj[key],
+ };
+ });
+ } else {
+ this.apiParams = [
+ {
+ key: "",
+ value: "",
+ },
+ ];
+ }
+ this.form = { ...data };
+ this.getTempleteList();
+ });
},
// 娣诲姞鏁版嵁閰嶇疆琛屾暟
insertion(index, type) {
diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
index 5a5dbd65517297f0a08e1a0e8460d0062af644c5..7301aa687c003189bd9bd84a09ea9c11418ed5d4 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
+++ b/base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
@@ -5,13 +5,8 @@
:maskClosable="false"
:title="title"
@cancel="handleClose"
- destroyOnClose
centered
>
- <template slot="footer">
- <a-button @click="handleReset">閲嶇疆</a-button>
- <a-button type="primary" @click="handleOk">纭畾</a-button>
- </template>
<a-form-model
ref="form"
:model="form"
@@ -46,6 +41,10 @@
<a-input-number v-model="form.sort" :min="1" />
</a-form-model-item>
</a-form-model>
+ <template slot="footer">
+ <a-button @click="handleReset">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleOk">纭畾</a-button>
+ </template>
</a-modal>
</div>
</template>
@@ -110,18 +109,20 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.form = { ...data };
- if (this.form.cover) {
- this.fileList = [
- {
- uid: "-2",
- name: this.form.cover,
- status: "done",
- url: this.api2 + this.form.cover,
- url2: this.form.cover,
- },
- ];
- }
+ this.$nextTick(() => {
+ this.form = { ...data };
+ if (this.form.cover) {
+ this.fileList = [
+ {
+ uid: "-2",
+ name: this.form.cover,
+ status: "done",
+ url: this.api2 + this.form.cover,
+ url2: this.form.cover,
+ },
+ ];
+ }
+ });
},
// 鍏抽棴寮圭獥
handleClose() {
@@ -180,6 +181,7 @@ export default {
},
// 閲嶇疆
handleReset() {
+ this.fileList = [];
this.$refs.form.resetFields();
},
},
diff --git a/base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue b/base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue
index f821f0974837d7ca2db639e316d1001f5c04b11d..33e92bff2dbc42add8db17e2357e79277ad0f561 100644
--- a/base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue
+++ b/base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue
@@ -157,11 +157,13 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.getBusinessData();
- this.form = { ...data };
- if (this.form.parentId == 0) {
- this.form.parentId = undefined;
- }
+ this.$nextTick(() => {
+ this.getBusinessData();
+ this.form = { ...data };
+ if (this.form.parentId == 0) {
+ this.form.parentId = undefined;
+ }
+ });
},
// 鍒囨崲涓氬姟绾у埆
changeIsBusiness() {
diff --git a/base-manager-ui/admin/src/pages/basicset/deploy/modal/AddStatement.vue b/base-manager-ui/admin/src/pages/basicset/deploy/modal/AddStatement.vue
index 161977e650f0b13800fab754f90bb1bf6370ea87..58eb340c0221f4aab9bf53edf362f0f6cc72f0b9 100644
--- a/base-manager-ui/admin/src/pages/basicset/deploy/modal/AddStatement.vue
+++ b/base-manager-ui/admin/src/pages/basicset/deploy/modal/AddStatement.vue
@@ -119,8 +119,10 @@ export default {
},
// 缂栬緫
onEdit(data, modelInfo) {
- this.modelInfo = modelInfo;
- this.formData = { ...data };
+ this.$nextTick(() => {
+ this.modelInfo = modelInfo;
+ this.formData = { ...data };
+ });
},
// 鍏抽棴寮圭獥
handleClose() {
@@ -149,5 +151,4 @@ export default {
};
</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue b/base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue
index e36f12ab00e5384b6c88746cb283ee68f77d6db3..61e7bdaf8773e0cb788335c8f83df8f416e4419a 100644
--- a/base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue
+++ b/base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue
@@ -92,6 +92,12 @@
</a-col>
</a-row>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button :loading="loading" type="primary" @click="handleOk"
+ >纭畾</a-button
+ >
+ </div>
</a-modal>
</template>
@@ -114,6 +120,7 @@ export default {
// }
// };
return {
+ loading: false,
labelCol: { span: 6 },
wrapperCol: { span: 14 },
siteInfo: {
@@ -179,9 +186,11 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.siteInfo.siteName = data.siteName;
- this.siteInfo.siteId = data.siteId;
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.siteInfo.siteName = data.siteName;
+ this.siteInfo.siteId = data.siteId;
+ this.form = { ...data };
+ });
},
// 淇濆瓨
handleOk() {
@@ -206,6 +215,10 @@ export default {
this.$refs.formData.resetFields();
this.Visible = false;
},
+ // 閲嶇疆
+ resetForm() {
+ this.$refs.formData.resetFields();
+ },
},
};
</script>
@@ -220,4 +233,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue b/base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
index 9e6b77024826471b1409228ca13427ff044ac507..c79933972d7998f6bb3b1a109f59b5004ef9ec58 100644
--- a/base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
+++ b/base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
@@ -1,7 +1,6 @@
<template>
<a-modal
:title="WindowTitle"
- @ok="handleAdd"
:visible="Visible"
@cancel="handleClose"
:maskClosable="false"
@@ -188,6 +187,12 @@
</a-col>
</a-row>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button :loading="loading" type="primary" @click="handleOk"
+ >纭畾</a-button
+ >
+ </div>
</a-modal>
</template>
@@ -288,12 +293,14 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.siteInfo.siteName = row.siteName;
- this.siteInfo.siteId = row.siteId;
- this.form = { ...row };
+ this.$nextTick(() => {
+ this.siteInfo.siteName = row.siteName;
+ this.siteInfo.siteId = row.siteId;
+ this.form = { ...row };
+ });
},
// 淇濆瓨
- async handleAdd() {
+ async handleOk() {
this.$refs.formData.validate(async (valid) => {
if (valid) {
let res = await addWindow({
@@ -314,6 +321,10 @@ export default {
this.$refs.formData.resetFields();
this.Visible = false;
},
+ // 閲嶇疆
+ resetForm() {
+ this.$refs.formData.resetFields();
+ },
// 鏀瑰彉鏃犱汉鍊煎畧
changeDuty(val) {
if (!val) {
diff --git a/base-manager-ui/admin/src/pages/basicset/hall/hallmanage/modal/AddHall.vue b/base-manager-ui/admin/src/pages/basicset/hall/hallmanage/modal/AddHall.vue
index 17fc1fb5db29dcd06009c69f1bbc8367bf7f565f..7b58dea011bb7bc6367fa4ab7937517cedd8353b 100644
--- a/base-manager-ui/admin/src/pages/basicset/hall/hallmanage/modal/AddHall.vue
+++ b/base-manager-ui/admin/src/pages/basicset/hall/hallmanage/modal/AddHall.vue
@@ -5,12 +5,7 @@
:maskClosable="false"
:title="title"
@cancel="handleClose"
- destroyOnClose
>
- <template slot="footer">
- <a-button @click="handleReset">閲嶇疆</a-button>
- <a-button type="primary" @click="handleOk">纭畾</a-button>
- </template>
<a-form-model
ref="form"
:model="form"
@@ -44,11 +39,15 @@
/>
</a-form-model-item>
</a-form-model>
+ <template slot="footer">
+ <a-button @click="handleReset">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleOk">纭畾</a-button>
+ </template>
</a-modal>
</div>
</template>
-
- <script>
+
+<script>
import { saveHall } from "@/services/hall";
import loacl from "@/utils/local";
export default {
@@ -100,7 +99,9 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.form = { ...data };
+ });
},
// 鍏抽棴寮圭獥
handleClose() {
@@ -128,9 +129,9 @@ export default {
},
};
</script>
-
+
<style lang="less" scoped>
.ant-input-number {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue b/base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue
index 0338715b37833478d15694bf1bf710ddbd18277f..a0991e19d5957c05c0c94272252fb3ba5534d106 100644
--- a/base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue
+++ b/base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue
@@ -5,7 +5,6 @@
:maskClosable="false"
title="鏂板澶у巺绐楀彛"
@cancel="handleClose"
- destroyOnClose
centered
>
<template slot="footer">
@@ -96,7 +95,9 @@ export default {
},
// 鏂板
onAdd(rows) {
- this.windowList = rows;
+ this.$nextTick(() => {
+ this.windowList = rows;
+ });
// this.form.windowId = rows.id;
// this.form.windowName = rows.name;
},
diff --git a/base-manager-ui/admin/src/pages/basicset/holiday/components/addfestivals.vue b/base-manager-ui/admin/src/pages/basicset/holiday/components/addfestivals.vue
index 454a28516f21ede15177e4f7db7176af439e7b54..e1c2aadecfa78c675e1ac42df1a6814efb1f24d5 100644
--- a/base-manager-ui/admin/src/pages/basicset/holiday/components/addfestivals.vue
+++ b/base-manager-ui/admin/src/pages/basicset/holiday/components/addfestivals.vue
@@ -2,7 +2,6 @@
<a-modal
:maskClosable="false"
:title="title"
- @ok="handleOk"
:visible="Visible"
@cancel="handleClose"
>
@@ -34,6 +33,12 @@
<a-textarea v-model="form.summary" placeholder allow-clear />
</a-form-model-item>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button :loading="loading" type="primary" @click="handleOk"
+ >纭畾</a-button
+ >
+ </div>
</a-modal>
</template>
@@ -41,8 +46,15 @@
import { addHoliday } from "@/services/festival";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
export default {
+ props: {
+ visibleDay: {
+ type: Boolean,
+ default: false,
+ },
+ },
data() {
return {
+ loading: false,
locale,
title: "閫夋嫨鑺傚亣鏃�",
date: [], // 鏃ユ湡
@@ -71,10 +83,15 @@ export default {
},
};
},
- props: {
- visibleDay: {
- type: Boolean,
- default: false,
+
+ computed: {
+ Visible: {
+ get() {
+ return this.visibleDay;
+ },
+ set(val) {
+ this.$emit("update:visibleDay", val);
+ },
},
},
methods: {
@@ -82,6 +99,7 @@ export default {
handleOk() {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
+ this.loading = true;
let year = new Date(parseInt(this.form.startTime)).getFullYear();
let res = await addHoliday({
...this.form,
@@ -95,6 +113,7 @@ export default {
this.handleClose();
this.$parent.getHolidayData();
}
+ this.loading = false;
}
});
},
@@ -114,22 +133,19 @@ export default {
// 缂栬緫
onEdit(data) {
this.title = "缂栬緫鑺傚亣鏃�";
- this.date = [String(data.startTime), String(data.endTime)];
- this.form = { ...data };
+ this.$nextTick(() => {
+ this.date = [String(data.startTime), String(data.endTime)];
+ this.form = { ...data };
+ });
},
handleClose() {
this.Visible = false;
this.$refs.ruleForm.resetFields();
},
- },
- computed: {
- Visible: {
- get() {
- return this.visibleDay;
- },
- set(val) {
- this.$emit("update:visibleDay", val);
- },
+ // 閲嶇疆
+ resetForm() {
+ this.date = [];
+ this.$refs.ruleForm.resetFields();
},
},
};
@@ -143,4 +159,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue b/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
index f3cb105c0ed6b65226ce66a99000979b79500487..0f431520faebc761f35f43705df27e32b1f2b95f 100644
--- a/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
+++ b/base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
@@ -36,10 +36,10 @@
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item label="鍖哄煙缂栧彿" prop="areaCode">
+ <a-form-model-item label="鍖哄煙缂栧彿">
<a-input
v-model="areaInfo.areaCode"
- readOnly
+ disabled
type="text"
placeholder="璇疯緭鍏ュ尯鍩熺紪鍙�"
/> </a-form-model-item
@@ -596,6 +596,7 @@ export default {
//閲嶇疆
resetForm() {
this.fileList = [];
+ this.cityData = [];
this.$refs.ruleForm.resetFields();
},
// 鍏抽棴瀵硅瘽妗�
@@ -612,31 +613,33 @@ export default {
},
// 缂栬緫
onEdit(data) {
- this.formInfo = { ...data };
- this.areaInfo.areaID = this.formInfo.areaID;
- this.areaInfo.areaCode = this.formInfo.areaCode;
- this.areaInfo.areaName = this.formInfo.areaName;
- this.cityData = [
- this.formInfo.proCode,
- this.formInfo.cityCode,
- this.formInfo.districtCode,
- ];
- this.formInfo.modelIds = this.formInfo.modelIds.map(Number);
- this.formInfo.amWorkStartTime = String(this.formInfo.amWorkStartTime);
- this.formInfo.amWorkEndTime = String(this.formInfo.amWorkEndTime);
- this.formInfo.pmWorkStartTime = String(this.formInfo.pmWorkStartTime);
- this.formInfo.pmWorkEndTime = String(this.formInfo.pmWorkEndTime);
- if (this.formInfo.logoPath) {
- this.fileList = [
- {
- uid: -1,
- status: "done",
- name: this.formInfo.logoPath,
- url: this.api2 + this.formInfo.logoPath,
- url2: this.formInfo.logoPath,
- },
+ this.$nextTick(() => {
+ this.formInfo = { ...data };
+ this.areaInfo.areaID = this.formInfo.areaID;
+ this.areaInfo.areaCode = this.formInfo.areaCode;
+ this.areaInfo.areaName = this.formInfo.areaName;
+ this.cityData = [
+ this.formInfo.proCode,
+ this.formInfo.cityCode,
+ this.formInfo.districtCode,
];
- }
+ this.formInfo.modelIds = this.formInfo.modelIds.map(Number);
+ this.formInfo.amWorkStartTime = String(this.formInfo.amWorkStartTime);
+ this.formInfo.amWorkEndTime = String(this.formInfo.amWorkEndTime);
+ this.formInfo.pmWorkStartTime = String(this.formInfo.pmWorkStartTime);
+ this.formInfo.pmWorkEndTime = String(this.formInfo.pmWorkEndTime);
+ if (this.formInfo.logoPath) {
+ this.fileList = [
+ {
+ uid: -1,
+ status: "done",
+ name: this.formInfo.logoPath,
+ url: this.api2 + this.formInfo.logoPath,
+ url2: this.formInfo.logoPath,
+ },
+ ];
+ }
+ });
},
// 淇濆瓨
handleOk() {
@@ -729,8 +732,10 @@ export default {
})
.then((res) => {
let { location } = res.geocodes[0];
- [this.formInfo.longitude, this.formInfo.latitude] =
- location.split(",");
+ [
+ this.formInfo.longitude,
+ this.formInfo.latitude,
+ ] = location.split(",");
})
.catch(() => {
this.$message.error("缁忕含搴﹁幏鍙栧け璐ワ紝璇疯緭鍏ユ纭殑鍦板潃");
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddDev.vue b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddDev.vue
index 7b5f3e53a45505b36fe1d149a5e5e788f08301e7..673b99ef0d7628d163a921703fea2ac0eaa38f07 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddDev.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddDev.vue
@@ -1,11 +1,6 @@
<template>
<div>
- <a-modal
- v-model="Visible"
- :title="title"
- @ok="handleOk"
- @cancel="handleClose"
- >
+ <a-modal v-model="Visible" :title="title" @cancel="handleClose">
<a-form-model
:model="form"
ref="form"
@@ -27,6 +22,10 @@
/>
</a-form-model-item>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleOk">纭畾</a-button>
+ </div>
</a-modal>
</div>
</template>
@@ -89,9 +88,12 @@ export default {
},
// 鍏抽棴瀵硅瘽妗�
handleClose() {
- this.$refs.form.clearValidate();
+ this.$refs.form.resetFields();
this.Visible = false;
},
+ resetForm() {
+ this.$refs.form.resetFields();
+ },
// 鏂板
onAdd() {
Object.assign(this.form, this.$options.data().form);
@@ -99,7 +101,9 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.form = { ...row };
+ setTimeout(() => {
+ this.form = { ...row };
+ }, 10);
},
},
};
@@ -114,4 +118,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue
index 6f281273cd972ba8f224b1f8e889322cbebfc741..017918d52b7f387fbe5e3c9bb111575877f59112 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue
@@ -1,11 +1,6 @@
<template>
<div>
- <a-modal
- v-model="Visible"
- :title="titleField"
- @ok="handleOk"
- @cancel="handleClose"
- >
+ <a-modal v-model="Visible" :title="titleField" @cancel="handleClose">
<a-form-model
:model="formData"
ref="formData"
@@ -54,6 +49,10 @@
<a-input-number v-model="formData.fieldOrderNo" :min="0" />
</a-form-model-item>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleOk">纭畾</a-button>
+ </div>
</a-modal>
</div>
</template>
@@ -152,7 +151,10 @@ export default {
});
},
handleClose() {
+ this.$refs.formData.resetFields();
this.Visible = false;
+ },
+ resetForm() {
this.$refs.formData.resetFields();
},
changeTemplate(val, e) {
@@ -166,7 +168,9 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.formData = { ...row };
+ this.$nextTick(() => {
+ this.formData = { ...row };
+ });
},
},
};
@@ -181,4 +185,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddTemplate.vue b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddTemplate.vue
index 7d381d500bc42c518c70ab7c83b8503343f97cb0..9225a77d56ecaba82f2adfe66f7ef86145375f84 100644
--- a/base-manager-ui/admin/src/pages/basicset/surface/modal/AddTemplate.vue
+++ b/base-manager-ui/admin/src/pages/basicset/surface/modal/AddTemplate.vue
@@ -1,11 +1,6 @@
<template>
<div>
- <a-modal
- v-model="Visible"
- :title="titleTemplate"
- @ok="handleOk"
- @cancel="handleClose"
- >
+ <a-modal v-model="Visible" :title="titleTemplate" @cancel="handleClose">
<a-form-model
:model="formData"
ref="formData"
@@ -31,6 +26,10 @@
/>
</a-form-model-item>
</a-form-model>
+ <div slot="footer">
+ <a-button @click="resetForm">閲嶇疆</a-button>
+ <a-button type="primary" @click="handleOk">纭畾</a-button>
+ </div>
</a-modal>
</div>
</template>
@@ -108,8 +107,8 @@ export default {
this.formData.productName = text;
},
handleClose() {
- this.Visible = false;
this.$refs.formData.resetFields();
+ this.Visible = false;
},
// 鏂板
onAdd() {
@@ -118,8 +117,12 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.formData = { ...row };
- console.log(row);
+ this.$nextTick(() => {
+ this.formData = { ...row };
+ });
+ },
+ resetForm() {
+ this.$refs.formData.resetFields();
},
handleOk() {
this.$refs.formData.validate(async (valid) => {
@@ -161,4 +164,4 @@ export default {
margin-right: 4px;
margin-bottom: 4px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/base-manager-ui/admin/src/pages/basicset/system/parameter/modal/AddParameter.vue b/base-manager-ui/admin/src/pages/basicset/system/parameter/modal/AddParameter.vue
index ce67b31a9673a2c9aa09e3e816f0789b147c7b52..b89487e8666076c9ea64a43877a5392713b1229d 100644
--- a/base-manager-ui/admin/src/pages/basicset/system/parameter/modal/AddParameter.vue
+++ b/base-manager-ui/admin/src/pages/basicset/system/parameter/modal/AddParameter.vue
@@ -148,7 +148,9 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.form = { ...row };
+ this.$nextTick(() => {
+ this.form = { ...row };
+ });
},
// 淇濆瓨
handleOk() {
@@ -168,5 +170,4 @@ export default {
};
</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/base-manager-ui/admin/src/pages/basicset/system/task/modal/AddTask.vue b/base-manager-ui/admin/src/pages/basicset/system/task/modal/AddTask.vue
index c8c0e8cefe3b3be79007bab1ad3266d96d3b2e26..1c01e451fd412b54647d6c957d12f7dc553226c5 100644
--- a/base-manager-ui/admin/src/pages/basicset/system/task/modal/AddTask.vue
+++ b/base-manager-ui/admin/src/pages/basicset/system/task/modal/AddTask.vue
@@ -209,7 +209,9 @@ export default {
},
// 缂栬緫
onEdit(row) {
- this.form = { ...row };
+ this.$nextTick(() => {
+ this.form = { ...row };
+ });
},
// 淇濆瓨
handleOk() {
@@ -229,5 +231,4 @@ export default {
};
</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue b/base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
index 781608b9ba2d4f67c760a95f725f63c19de98057..7300e8ee34a98e058176372f06d4caefee05a6e9 100644
--- a/base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
+++ b/base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
@@ -527,22 +527,26 @@ export default {
},
// 缂栬緫
onEdit(data) {
- // this.editWindow(data.deptId);
- this.form = { ...data };
- this.form.loginName && this.$delete(this.form, "loginName");
- this.form.loginPwd && this.$delete(this.form, "loginPwd");
- this.form.windowId = this.form.windowId ? this.form.windowId : undefined;
- if (this.form.photoPath) {
- this.fileList = [
- {
- uid: -1,
- status: "done",
- name: this.form.photoPath,
- url: this.api2 + this.form.photoPath,
- url2: this.form.photoPath,
- },
- ];
- }
+ this.$nextTick(() => {
+ // this.editWindow(data.deptId);
+ this.form = { ...data };
+ this.form.loginName && this.$delete(this.form, "loginName");
+ this.form.loginPwd && this.$delete(this.form, "loginPwd");
+ this.form.windowId = this.form.windowId
+ ? this.form.windowId
+ : undefined;
+ if (this.form.photoPath) {
+ this.fileList = [
+ {
+ uid: -1,
+ status: "done",
+ name: this.form.photoPath,
+ url: this.api2 + this.form.photoPath,
+ url2: this.form.photoPath,
+ },
+ ];
+ }
+ });
},
// 鍏抽棴瀵硅瘽妗�
handleClose() {
@@ -556,6 +560,7 @@ export default {
// 閲嶇疆
handleReset() {
// this.form.windowName = "";
+ this.fileList = [];
this.$refs.formData.resetFields();
},
// 鐓х墖涓婁紶
diff --git a/base-manager-ui/admin/src/pages/basicset/workman/components/EditPwd.vue b/base-manager-ui/admin/src/pages/basicset/workman/components/EditPwd.vue
index f291bdc2e4d3287b5056118256c04aafdde0608e..af08b83b680a1380980ad58811cc87262eb6e266 100644
--- a/base-manager-ui/admin/src/pages/basicset/workman/components/EditPwd.vue
+++ b/base-manager-ui/admin/src/pages/basicset/workman/components/EditPwd.vue
@@ -13,7 +13,7 @@
:label-col="{ span: 5 }"
:wrapper-col="{ span: 19 }"
>
- <a-form-model-item label="璐﹀彿" prop="loginName">
+ <a-form-model-item label="璐﹀彿">
<a-input disabled placeholder="璇疯緭鍏ヨ处鍙�" v-model="form.loginName" />
</a-form-model-item>
<!-- <a-form-model-item label="鏃у瘑鐮�" prop="oldPwd">
@@ -115,12 +115,15 @@ export default {
},
// 鍏抽棴瀵硅瘽妗�
handleClose() {
+ this.form.loginName = "";
this.$refs.form.resetFields();
this.Visible = false;
},
// 鑾峰彇鐢ㄦ埛璐﹀彿淇℃伅
getUserInfo(account) {
- this.form.loginName = account;
+ this.$nextTick(() => {
+ this.form.loginName = account;
+ });
},
},
};
@@ -135,4 +138,4 @@ export default {
/deep/.ant-form-explain {
position: absolute;
}
-</style>
\ No newline at end of file
+</style>