diff --git a/src/assets/styles/element-ui.css b/src/assets/styles/element-ui.css
new file mode 100644
index 0000000..49c7053
--- /dev/null
+++ b/src/assets/styles/element-ui.css
@@ -0,0 +1,85 @@
+@charset "UTF-8";
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+ font-weight: 400 !important;
+}
+
+.el-upload input[type="file"] {
+ display: none !important;
+}
+
+.el-upload__input {
+ display: none;
+}
+
+.cell .el-tag {
+ margin-right: 0px;
+}
+
+.small-padding .cell {
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.fixed-width .el-button--mini {
+ padding: 7px 10px;
+ width: 60px;
+}
+
+.status-col .cell {
+ padding: 0 10px;
+ text-align: center;
+}
+
+.status-col .cell .el-tag {
+ margin-right: 0px;
+}
+
+.el-dialog {
+ transform: none;
+ left: 0;
+ position: relative;
+ margin: 0 auto;
+}
+
+.upload-container .el-upload {
+ width: 100%;
+}
+
+.upload-container .el-upload .el-upload-dragger {
+ width: 100%;
+ height: 200px;
+}
+
+.el-dropdown-menu a {
+ display: block;
+}
+
+.el-textarea__inner {
+ font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
+
+.el-range-editor.el-input__inner {
+ display: inline-flex !important;
+}
+
+.el-range-separator {
+ box-sizing: content-box;
+}
+
+.el-menu--collapse
+> div
+> .el-submenu
+> .el-submenu__title
+.el-submenu__icon-arrow {
+ display: none;
+}
+
+.el-card {
+ border-radius: 0;
+ border: none;
+}
+
+.el-form-item--mini.el-form-item {
+ margin-bottom: 10px;
+}
diff --git a/src/assets/styles/element-ui.min.css b/src/assets/styles/element-ui.min.css
new file mode 100644
index 0000000..bd9f1b6
--- /dev/null
+++ b/src/assets/styles/element-ui.min.css
@@ -0,0 +1 @@
+.el-breadcrumb__inner,.el-breadcrumb__inner a{font-weight:400 !important}.el-upload input[type="file"]{display:none !important}.el-upload__input{display:none}.cell .el-tag{margin-right:0px}.small-padding .cell{padding-left:5px;padding-right:5px}.fixed-width .el-button--mini{padding:7px 10px;width:60px}.status-col .cell{padding:0 10px;text-align:center}.status-col .cell .el-tag{margin-right:0px}.el-dialog{transform:none;left:0;position:relative;margin:0 auto}.upload-container .el-upload{width:100%}.upload-container .el-upload .el-upload-dragger{width:100%;height:200px}.el-dropdown-menu a{display:block}.el-textarea__inner{font-family:"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif}.el-range-editor.el-input__inner{display:inline-flex !important}.el-range-separator{box-sizing:content-box}.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow{display:none}.el-card{border-radius:0;border:none}.el-form-item--mini.el-form-item{margin-bottom:10px}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 63e9bad..dd56903 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -99,3 +99,6 @@
border-radius: 0;
border: none;
}
+.el-form-item--mini.el-form-item {
+ margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/src/components/DMCheckbox/index.vue b/src/components/DMCheckbox/index.vue
index e4dff52..e603745 100644
--- a/src/components/DMCheckbox/index.vue
+++ b/src/components/DMCheckbox/index.vue
@@ -82,8 +82,6 @@ export default {
}
::v-deep .el-checkbox__label {
padding-left: 0;
- font-size: 16px;
- line-height: 16px;
color: rgba($color: #000000, $alpha: 0.6);
}
}
diff --git a/src/components/DMRadio/index.vue b/src/components/DMRadio/index.vue
index 9b78282..e63ee23 100644
--- a/src/components/DMRadio/index.vue
+++ b/src/components/DMRadio/index.vue
@@ -51,7 +51,7 @@ export default {
watch: {
value: {
handler(val) {
- this.modelValue = val || '全部';
+ this.modelValue = val === undefined ? '全部' : val;
},
deep: true,
immediate: true
@@ -90,8 +90,8 @@ export default {
}
::v-deep .el-radio__label {
padding-left: 0;
- font-size: 16px;
- line-height: 16px;
+ font-size: 14px;
+ line-height: 14px;
color: rgba($color: #000000, $alpha: 0.6);
}
}
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index de8a3e0..60f73f4 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -80,6 +80,7 @@ export default {
// eslint-disable-next-line vue/no-mutating-props
this.columns[item].visible = !data.includes(key);
}
+ localStorage.setItem(`${this.$route.name}-table-columns`, JSON.stringify(this.columns));
},
// 打开显隐列dialog
showColumn() {
diff --git a/src/main.js b/src/main.js
index ad6da66..dc1df31 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,7 @@ Vue.use(plugins);
Vue.use(VueMeta);
Vue.use(Element, {
- size: Cookies.get('size') || 'small' // set element-ui default size
+ size: Cookies.get('size') || 'mini' // set element-ui default size
});
Vue.config.productionTip = false;
diff --git a/src/views/finance/finance/index.vue b/src/views/finance/expense/index.vue
similarity index 100%
rename from src/views/finance/finance/index.vue
rename to src/views/finance/expense/index.vue
diff --git a/src/views/finance/register/columns.js b/src/views/finance/register/columns.js
new file mode 100644
index 0000000..1713201
--- /dev/null
+++ b/src/views/finance/register/columns.js
@@ -0,0 +1,16 @@
+export const defaultColumns = [
+ { key: 0, prop: 'state', label: `全款状态`, visible: true },
+ { key: 1, prop: 'followUserName', label: `归属人员`, visible: true },
+ { key: 2, prop: 'area', label: `所属区域`, visible: true },
+ { key: 3, prop: 'offlineReceiverName', label: `线下接待人员`, visible: true },
+ { key: 4, prop: 'dealDate', label: `成交时间`, visible: true },
+ { key: 5, prop: 'name', label: `学员姓名`, visible: true },
+ { key: 6, prop: 'phone', label: `联系方式`, visible: true },
+ { key: 7, prop: 'source', label: `线索来源`, visible: true },
+ { key: 8, prop: 'signPrice', label: `报名价格`, visible: true },
+ { key: 9, prop: 'schoolName', label: `报名驾校`, visible: true },
+ { key: 10, prop: 'placeName', label: `报名场地`, visible: true },
+ { key: 11, prop: 'className', label: `报名班型`, visible: true },
+ { key: 12, prop: 'schoolPeople', label: `对接人`, visible: true },
+ { key: 13, prop: 'schoolPay', label: `驾校支付`, visible: true }
+];
diff --git a/src/views/finance/register/components/SearchForm.vue b/src/views/finance/register/components/SearchForm.vue
new file mode 100644
index 0000000..1beeb8a
--- /dev/null
+++ b/src/views/finance/register/components/SearchForm.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
diff --git a/src/views/finance/register/index.vue b/src/views/finance/register/index.vue
new file mode 100644
index 0000000..05dea34
--- /dev/null
+++ b/src/views/finance/register/index.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+ 新增
+ 导出
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 审核
+ 删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index 37dd7fa..9fcd54b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.1.114:8086`,
+ target: `http://118.31.23.45/duima/`,
// target: `http://vue.ruoyi.vip/prod-api/`,
changeOrigin: true,
pathRewrite: {