From dc3af0cbb4a6d105bdff497b510cc0a87b3e8d0a Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期五, 28 二月 2025 17:53:44 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev --- src/views/business/productOrder/components/add.vue | 43 +++---------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue index 62c5d87..93e2d2c 100644 --- a/src/views/business/productOrder/components/add.vue +++ b/src/views/business/productOrder/components/add.vue @@ -933,7 +933,7 @@ this.getCompanyList() }, getCompanyList () { - selectCustomPageList().then(res => { + selectCustomPageList({...this.page1}).then(res => { this.tableLoading1 = false if (res.code === 200) { this.tableData1 = res.data.records @@ -2143,51 +2143,14 @@ this.productList0.splice(index,1) }, goBack () { - const obj = { path: "/business/productOrder" }; - this.$tab.closeOpenPage(obj); + this.$router.go(-1) } } } </script> <style scoped> -.ins_order_add .el-input-group__append, -.el-input-group__prepend { - padding: 0 10px; -} - -.ins_order_add .el-tree-node__content { - height: 32px; - font-size: 14px; - border-radius: 2px; -} - -.ins_order_add .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { +.el-table .warning-row .cell { color: #3A7BFA; -} - -.ins_order_add .has-gutter .el-table__cell .cell { - line-height: 30px; - background-color: #fafafa; -} - -.ins_order_add .has-gutter .el-table__cell { - background-color: #fafafa !important; -} - -.ins_order_add .el-table__row .cell { - font-size: 12px; -} - -.ins_order_add .el-table .warning-row .cell { - color: #3A7BFA; -} - -.ins_order_add .el-select .is-disabled { - background: transparent !important; -} - -.ins_order_add .el-select .is-disabled .el-input__inner { - background: transparent !important; } </style> -- Gitblit v1.9.3