diff --git a/src/store/modules/form.js b/src/store/modules/form.js
index 0c2fa4e..ea802e7 100644
--- a/src/store/modules/form.js
+++ b/src/store/modules/form.js
@@ -1,4 +1,4 @@
-import {index} from "@/api/system/customFormField";
+import {index,destroy} from "@/api/system/customFormField";
import {show,save} from "@/api/system/customForm";
import {Message} from "element-ui";
@@ -113,6 +113,24 @@ const actions = {
});
});
},
+ deleteField: ({ state, commit, dispatch }) => {
+ if (state.selectedForm?.id) {
+ return new Promise((resolve, reject) => {
+ destroy({ id: state.selectedForm.id }).then(res => {
+ resolve(res)
+ commit('CLEAR_SELECTED')
+ commit('CLEAR_SELECTED_INDEX')
+ }).catch(err => {
+ reject(err)
+ })
+ })
+ } else {
+ return new Promise((resolve, reject) => {
+ state.formList.splice(state.selectedIndex, 1);
+ resolve(false)
+ })
+ }
+ }
};
export default {
diff --git a/src/views/assets/fileList.vue b/src/views/assets/fileList.vue
index ec3c473..3980e98 100644
--- a/src/views/assets/fileList.vue
+++ b/src/views/assets/fileList.vue
@@ -83,6 +83,15 @@ export default {
mixins: [authMixin],
data() {
return {
+ wxAreas: [
+ "宜兴市",
+ "惠山区",
+ "新吴区",
+ "梁溪区",
+ "江阴市",
+ "滨湖区",
+ "锡山区",
+ ],
codeUri: "",
showModal: false,
table: [
@@ -105,6 +114,14 @@ export default {
return ({ row.land.name ? `[土地]${row.land.name}` : `[房产]${row.house.name}` })
}
},
+ {
+ prop: "area",
+ label: "资产地区",
+ width: 140,
+ customFn: row => {
+ return ({ row.land.area? this.wxAreas[row.land.area-1] : this.wxAreas[row.house.area-1] })
+ }
+ },
{
prop: "created_at",
label: "创建时间",
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue
index cc68c8d..7a00711 100644
--- a/src/views/component/dialog.vue
+++ b/src/views/component/dialog.vue
@@ -26,6 +26,7 @@ export default {
title: "新增",
visible: this.dialogVisible,
width: "600px",
+ "close-on-click-modal": false
},
on: {
"update:visible": (val) => {
diff --git a/src/views/system/components/editPane.vue b/src/views/system/components/editPane.vue
index 0d4b795..cab8ea9 100644
--- a/src/views/system/components/editPane.vue
+++ b/src/views/system/components/editPane.vue
@@ -139,15 +139,7 @@
确定
@@ -236,6 +228,10 @@ export default {
this.$store.commit("form/CLEAR_SELECTED");
this.$store.commit("form/CLEAR_SELECTED_INDEX");
},
+
+ destroyField () {
+ this.$store.dispatch('form/deleteField').then((res) => res ? this.$emit('refresh') : '')
+ }
},
computed: {
...mapState("form", ["selectedForm", "formList", "selectedIndex"]),