Merge pull request '财务' (#5) from dev-qsh into master

Reviewed-on: http://114.55.169.15:3000/qiushanhe/dm-manage-web/pulls/5

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;
+}

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}

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;
+}

src/components/DMCheckbox/index.vue

@@ -0,0 +1,92 @@
+<template>
+  <el-checkbox-group v-model="modelValue">
+    <el-checkbox v-if="allText" class="no-cicrle" label="全部" @change="handleAll">全部</el-checkbox>
+    <el-checkbox v-for="(item, index) in list" :key="index" class="no-cicrle" :label="item[name]" @change="handleChange">
+      {{ item[label] }}
+    </el-checkbox>
+  </el-checkbox-group>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    allText: {
+      // 是否展示 "全部"，有字则展示
+      type: String,
+      default: ''
+    },
+    showBottomLine: {
+      // 是否展示底部下划线，类似tab标签页
+      type: Boolean,
+      default: false
+    },
+    list: {
+      type: Array,
+      default: () => []
+    },
+    label: {
+      // key
+      type: String,
+      default: 'label'
+    },
+    name: {
+      // value
+      type: String,
+      default: 'value'
+    }
+  },
+  data() {
+    return {
+      modelValue: undefined
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (this.allText) {
+          this.modelValue = val.length > 0 ? val : ['全部'];
+        } else {
+          this.modelValue = val.filter((item) => item !== '全部');
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    handleAll() {
+      this.modelValue = ['全部'];
+      this.$emit('input', []);
+    },
+    handleChange() {
+      if (this.modelValue.some((item) => item === '全部')) {
+        this.modelValue.shift();
+      } else if (this.modelValue.length == 0) {
+        this.modelValue = ['全部'];
+      }
+      this.$emit('input', this.modelValue.every((item) => item === '全部') ? [] : this.modelValue);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.no-cicrle {
+  ::v-deep .el-checkbox__input,
+  .el-checkbox__input {
+    display: none;
+  }
+  ::v-deep .el-checkbox__label {
+    padding-left: 0;
+    color: rgba($color: #000000, $alpha: 0.6);
+  }
+}
+.no-cicrle.is-checked ::v-deep .el-checkbox__label {
+  color: #0075ff;
+  font-weight: bold;
+}
+</style>

src/components/DMRadio/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div :class="{ 'border-bottom': showBottomLine }">
+    <el-radio-group v-model="modelValue" @change="handleChange">
+      <el-radio v-if="allText" class="no-cicrle" :style="{'margin-bottom': gutter}" label="全部">全部</el-radio>
+      <el-radio v-for="(item,index) in list" :key="index" class="no-cicrle" :style="{'margin-bottom': gutter}" :label="item[name]">
+        {{ item[label] }}
+      </el-radio>
+    </el-radio-group>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: [String, Number],
+    allText: {
+      // 是否展示 "全部"，有字则展示
+      type: String,
+      default: ''
+    },
+    showBottomLine: {
+      // 是否展示底部下划线，类似tab标签页
+      type: Boolean,
+      default: false
+    },
+    list: {
+      type: Array,
+      default: () => []
+    },
+    label: {
+      // key
+      type: String,
+      default: 'label'
+    },
+    name: {
+      // value
+      type: String,
+      default: 'value'
+    },
+    gutter: {
+      // 上下间隔
+      type: String,
+      default: '0'
+    }
+  },
+  data() {
+    return {
+      modelValue: undefined
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.modelValue = val === undefined ? '全部' : val;
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    handleChange(value) {
+      this.$emit('input', this.modelValue === '全部' ? undefined : this.modelValue);
+      this.$emit('change', this.modelValue === '全部' ? undefined : this.modelValue);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.border-bottom {
+  width: 100%;
+  border-bottom: 2px solid rgba($color: #000000, $alpha: 0.08);
+  ::v-deep .is-checked .el-radio__label {
+    position: relative;
+    &::after {
+      content: '';
+      position: absolute;
+      left: 0;
+      bottom: -10.5px;
+      right: 0;
+      height: 2px;
+      background-color: #0075ff;
+    }
+  }
+}
+.no-cicrle {
+  ::v-deep .el-radio__input,
+  .el-checkbox__input {
+    display: none;
+  }
+  ::v-deep .el-radio__label {
+    padding-left: 0;
+    font-size: 14px;
+    line-height: 14px;
+    color: rgba($color: #000000, $alpha: 0.6);
+  }
+}
+.no-cicrle.is-checked ::v-deep .el-radio__label {
+  color: #0075ff;
+  font-weight: bold;
+}
+</style>

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() {

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;

src/views/finance/administration/components/SearchForm.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <el-form ref="form" :model="searchForm" label-width="100px">
+      <el-form-item label-width="0">
+        <DMRadio v-model="searchForm.quickSearch" show-bottom-line :list="quickList" />
+      </el-form-item>
+      <el-form-item label="意向状态：">
+        <DMRadio v-model="searchForm.status" :list="statusList" all-text="全部" />
+      </el-form-item>
+      <el-form-item label="意向状态2：">
+        <DMCheckbox v-model="searchForm.status2" :list="statusList" />
+      </el-form-item>
+      <el-button type="primary" @click="$emit('search')">查询</el-button>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+import DMRadio from '@/components/DMRadio';
+import DMCheckbox from '@/components/DMCheckbox';
+export default {
+  components: {
+    DMRadio,
+    DMCheckbox
+  },
+  data() {
+    return {
+      searchForm: {
+        quickSearch: 1,
+        status: undefined,
+        status2: []
+      },
+      quickList: [
+        { value: 1, label: '我创建的' },
+        { value: 2, label: '我的有效' }
+      ],
+      statusList: [
+        { value: 1, label: 'A高意向' },
+        { value: 2, label: 'B中意向' }
+      ]
+    };
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/finance/administration/index.vue

@@ -1,7 +1,8 @@
 <template>
-  <div>
-    <el-card shadow="always" :body-style="{ padding: '20px' }" />
-    <SearchForm />
+  <div class="p20">
+    <el-card shadow="always" :body-style="{ padding: '20px' }">
+      <SearchForm ref="SearchForm" @search="getTableList" />
+    </el-card>
   </div>
 </template>
 
@@ -18,6 +19,14 @@ export default {
         pageSize: 20
       }
     };
+  },
+  methods: {
+    getTableList() {
+      const tempForm = this.$refs.SearchForm.searchForm;
+      const params = { ...this.searchForm, ...tempForm };
+      console.log(params);
+      // api.list(params)
+    }
   }
 };
 </script>

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 }
+];

src/views/finance/register/components/SearchForm.vue

@@ -0,0 +1,106 @@
+<template>
+  <el-form ref="searchForm" :model="searchForm" inline label-width="80px">
+    <el-row>
+      <el-form-item label="审核状态：" label-width="90px">
+        <DMRadio v-model="searchForm.checkState" :list="auditStatusOptions" all-text="全部" />
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="是否全款：" label-width="90px">
+        <DMRadio v-model="searchForm.state" :list="stateOptions" all-text="全部" />
+      </el-form-item>
+    </el-row>
+    <el-row>
+      <el-form-item label="回款状态：" label-width="90px">
+        <DMRadio v-model="searchForm.moneyState" :list="moneyStateOptions" label="dictLabel" name="dictCode" all-text="全部" />
+      </el-form-item>
+    </el-row>
+    <el-form-item label="快速查询">
+      <el-input v-model="searchForm.name" placeholder="姓名/联系方式" clearable @keyup.enter.native="handleQuery" />
+    </el-form-item>
+    <el-form-item label="成交时间">
+      <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+    </el-form-item>
+    <el-form-item label="驾校">
+      <el-select v-model="searchForm.signSchool" placeholder="请选择" clearable>
+        <el-option v-for="dict in schoolOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="跟进人员">
+      <el-select v-model="searchForm.followUser2" placeholder="请选择" clearable>
+        <el-option v-for="dict in userOptions" :key="dict.id" :label="dict.name" :value="dict.id" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label-width="0">
+      <el-button type="primary" icon="el-icon-search" @click="$emit('search')">搜索</el-button>
+      <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import DMRadio from '@/components/DMRadio';
+export default {
+  components: {
+    DMRadio
+  },
+  data() {
+    return {
+      searchForm: {
+        checkState: undefined,
+        state: undefined,
+        moneyState: undefined,
+        name: undefined,
+        dealDate: [],
+        signSchool: undefined,
+        followUser2: undefined
+      },
+      auditStatusOptions: [
+        { label: '待审核', value: 1 },
+        { label: '已审核', value: 2 },
+        { label: '驳回', value: 3 }
+      ],
+      stateOptions: [
+        { label: '全款', value: true },
+        { label: '非全款', value: false }
+      ],
+      moneyStateOptions: [],
+      schoolOptions: [],
+      userOptions: []
+    };
+  },
+  created() {
+    this.getDicts('dm_money_state').then((response) => {
+      this.moneyStateOptions = response.data;
+    });
+  },
+  methods: {
+    resetQuery() {
+      this.searchForm = {
+        checkState: undefined,
+        state: undefined,
+        moneyState: undefined,
+        name: undefined,
+        dealDate: [],
+        signSchool: undefined,
+        followUser2: undefined
+      };
+    },
+    getEmployee() {
+      // getEmployee({ coach: false }).then((resp) => {
+      //   if (resp.code == 200) {
+      //     this.userOptions = resp.data
+      //   }
+      // })
+    },
+    getSchools() {
+      // getSchools().then((resp) => {
+      //   this.schoolOptions = resp.data
+      // })
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/finance/register/index.vue

@@ -0,0 +1,90 @@
+<!-- 成交登记 -->
+<template>
+  <div class="p20">
+    <SearchForm v-show="showSearch" ref="SearchForm" @search="_getTableList" />
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        <el-button type="warning" icon="el-icon-download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="_getTableList" />
+    </el-row>
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="selection" width="50" align="center" />
+      <template v-for="item in columns">
+        <el-table-column v-if="item.visible" :key="item.prop" :label="item.label" align="center" min-width="100" :prop="item.prop" />
+      </template>
+      <el-table-column label="操作" fixed="right" align="center" width="160">
+        <template slot-scope="scope">
+          <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button type="text" @click="handleCheck(scope.row)">审核</el-button>
+          <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize" @pagination="_getTableList" />
+  </div>
+</template>
+
+<script>
+import SearchForm from './components/SearchForm.vue';
+import { defaultColumns } from './columns.js';
+export default {
+  components: {
+    SearchForm
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 显示搜索条件
+      showSearch: true,
+      searchForm: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      tableList: [],
+      total: 0,
+      columns: []
+    };
+  },
+  created() {
+    const str = localStorage.getItem(`${this.$route.name}-table-columns`);
+    this.columns = str ? JSON.parse(str) : defaultColumns;
+    // this._getTableList();
+  },
+  methods: {
+    async _getTableList() {
+      const tempForm = this.$refs.SearchForm?.searchForm || {};
+      const params = { ...this.searchForm, ...tempForm };
+      console.log(params);
+      // api.list(params)
+      this.tableList = [];
+      for (let i = 0; i < 20; i++) {
+        this.tableList.push({ name: `数据${i + 1}` });
+      }
+    },
+    handleExport() {
+      const tempForm = this.$refs.SearchForm?.searchForm || {};
+      const params = { ...this.searchForm, ...tempForm };
+      this.$confirm('是否确认导出所有成交记录项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then((resp) => {
+          // return exportData(params)
+        })
+        .then((response) => {
+          // this.download(response.msg);
+        })
+        .catch(function () {});
+    },
+    handleAdd() {}
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

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.2.39:8086`,
+        target: `http://118.31.23.45/duima/`,
         // target: `http://vue.ruoyi.vip/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
@@ -105,10 +105,12 @@ module.exports = {
       config
         .plugin('ScriptExtHtmlWebpackPlugin')
         .after('html')
-        .use('script-ext-html-webpack-plugin', [{
-          // `runtime` must same as runtimeChunk name. default is `runtime`
-          inline: /runtime\..*\.js$/
-        }])
+        .use('script-ext-html-webpack-plugin', [
+          {
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/
+          }
+        ])
         .end();
       config.optimization.splitChunks({
         chunks: 'all',