diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index e221c19..efa47cd 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -221,7 +221,6 @@ const actions = { Object.assign(loadMenuData, data) asyncRoutes.length=0; generaMenu(asyncRoutes, loadMenuData) - console.log(123321,asyncRoutes) let accessedRoutes if (roles.includes('admin')) { // alert(JSON.stringify(asyncRoutes)) diff --git a/src/views/component/deal.vue b/src/views/component/deal.vue new file mode 100644 index 0000000..1e0bddd --- /dev/null +++ b/src/views/component/deal.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/component/loss.vue b/src/views/component/loss.vue new file mode 100644 index 0000000..7135a46 --- /dev/null +++ b/src/views/component/loss.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/component/table.vue b/src/views/component/table.vue index 98d83b4..c5021a0 100644 --- a/src/views/component/table.vue +++ b/src/views/component/table.vue @@ -267,8 +267,7 @@ - + + @@ -335,6 +346,16 @@ @refresh="$refs['xyTable'].getTableData()" > + + @@ -356,7 +377,9 @@ import headerContent from "@/components/LxHeader/XyContent.vue"; import drawer from "@/views/component/drawer.vue"; import imports from "./imports.vue"; import addVenue from "@/views/venues/components/add.vue"; -import addFollow from "@/views/orders/components/addFollow.vue" +import addFollow from "@/views/orders/components/addFollow.vue"; +import loss from "@/views/component/loss.vue"; +import deal from "./deal.vue"; export default { components: { LxHeader, @@ -366,6 +389,8 @@ export default { imports, addVenue, addFollow, + loss, + deal, }, mixins: [authMixin], provide: { diff --git a/src/views/orders/components/addFollow.vue b/src/views/orders/components/addFollow.vue index 03ef42b..ab57ea0 100644 --- a/src/views/orders/components/addFollow.vue +++ b/src/views/orders/components/addFollow.vue @@ -110,42 +110,6 @@ export default { writable: true, }); } - let promiseAll = [] - this.formInfo.forEach((info) => { - if ( - info._relations?.link_relation === "newHasMany" || - info._relations?.link_relation === "hasMany" - ) { - if (this.originalForm[info._relations.link_with_name]) { - this.originalForm[info._relations.link_with_name].map((i) => { - promiseAll.push( - destroy({ - id: i.id, - table_name: info._relations.link_table_name, - }) - ); - }); - } - } - - if ( - info._relations?.link_relation === "newHasMany" || - info._relations?.link_relation === "hasMany" - ) { - if (info.edit_input === "files") { - this.form[info._relations.link_with_name] = this.file[ - info.field - ]?.map((i) => { - let copyRelation = i?.response ? deepCopy(i?.response) : ""; - delete copyRelation.id; - return { - file_id: i?.response?.id, - ...copyRelation, - }; - }); - } - } - }) save(Object.assign(this.form, { table_name: 'follows' })).then(res => { this.$Message.success({