caojunjie 2 rokov pred
rodič
commit
27baaa92e0

+ 43 - 0
src/api/iosBasicData/bfees.js

@@ -0,0 +1,43 @@
+import request from '@/router/axios';
+
+export const bfeesList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/bfees/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const bfeesDetail = (id) => {
+  return request({
+    url: '/api/blade-los/bfees/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const bfeesRemove = (ids) => {
+  return request({
+    url: '/api/blade-los/bfees/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const bfeesSubmit = (row) => {
+  return request({
+    url: '/api/blade-los/bfees/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+

+ 1 - 1
src/components/iosbasic-data/searchquery.vue

@@ -3,7 +3,7 @@
         <div style="display:flex">
             <!--<slot v-if="slot" name="slot"></slot>-->
             <div style="width: 100%;">
-                <el-select v-model="selectValue" size="small" placeholder="请选择"
+                <el-select style="width: 100%" v-model="selectValue" size="small" placeholder="请选择"
                            :filterable="filterable" :clearable="clearable"
                            :remote="remote" :remote-method="remoteMethod"
                            :multiple="multiple" :collapse-tags="collapseTags"

+ 4 - 0
src/enums/column-name.js

@@ -1333,6 +1333,10 @@ const columnName = [{
     code: 302,
     name: '货运代理-基础资料-费用信息'
   },
+  {
+    code: 302.1,
+    name: '货运代理-基础资料-费用类别'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 0 - 409
src/views/iosBasicData/bfeesdefine/bfeesde.vue

@@ -1,409 +0,0 @@
-<!--费用信息详情-->
-<template>
-    <div class="borderless" v-loading="pageLoading">
-        <div class="customer-head">
-            <div class="customer-back">
-                <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-                           @click="backToList">返回列表
-                </el-button>
-            </div>
-            <div class="add-customer-btn">
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"
-                            :loading="saveLoading" @click="editHandle">编 辑
-                </el-button>
-                <el-button  size="small" type="primary" style="margin-right: 8px" v-else
-                            :loading="saveLoading" @click="editCustomer">保 存
-                </el-button>
-            </div>
-        </div>
-        <div class="customer-main">
-            <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
-                <containerTitle title="基础资料"></containerTitle>
-                <basic-container :showBtn="true">
-                    <el-row>
-                        <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8"
-                                :class="{ isShow: item.display }" >
-                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                <el-select v-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
-                                           filterable style="width: 100%" size="small"
-                                           :disabled="item.disabled || detailData.seeDisabled">
-                                    <el-option v-for="(ite, inde) in item.dicData" :key="inde" :label="ite.label"
-                                               :value="ite.value"></el-option>
-                                </el-select>
-                                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small"
-                                          autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" :placeholder="'请输入' + item.label"></el-input>
-                                <el-input v-else type="age" style="width: 100%;" v-model.trim="form[item.prop]" size="small" autocomplete="off"
-                                          :disabled="item.disabled || detailData.seeDisabled" clearable :placeholder="'请输入' + item.label"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </basic-container>
-            </el-form>
-        </div>
-
-        <div class="customer-main margintop">
-            <containerTitle title="费用信息"></containerTitle>
-            <basic-container>
-                <div style="margin-bottom: 10px">
-                    <el-button type="primary"
-                               size="small"
-                               :disabled="detailData.seeDisabled"
-                               @click="costpingCompanyAdd">新增数据
-                    </el-button>
-                </div>
-                <el-table
-                    stripe
-                    :data="form.costList"
-                    id="out-table"
-                    :header-cell-class-name="headerClassName"
-                    style="width: 100%">
-                    <el-table-column
-                        prop="remarks"
-                        label="备注">
-                    </el-table-column>
-                    <el-table-column label="操作">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                :disabled="detailData.seeDisabled"
-                                @click="costCompanyEdit(scope.$index, scope.row)">编辑</el-button>
-                            <el-button
-                                size="small"
-                                type="text"
-                                :disabled="detailData.seeDisabled"
-                                @click="costCompanyDelete(scope.$index, scope.row)">删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </basic-container>
-        </div>
-
-
-        <!--费用添加弹窗-->
-        <el-dialog
-            title="费用"
-            :visible.sync="costVisible"
-            width="50%"
-            append-to-body
-            :destroy-on-close="true"
-            :modal-append-to-body="false"
-            :before-close="costClose">
-            <div>
-                <el-form :model="costForm" ref="costForm" label-width="80px" class="demo-ruleForm">
-                    <el-row>
-                        <el-col v-for="(item, index) in costData.column" :key="index" :span="item.span ? item.span : 12"
-                                :class="{ isShow: item.display }" >
-                            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                <el-select v-if="item.type == 'select'"  v-model="costForm[item.prop]" :placeholder="'请选择' + item.label" clearable
-                                           filterable style="width: 100%" size="small"
-                                           :disabled="item.disabled || detailData.seeDisabled">
-                                    <el-option v-for="(ite, inde) in item.dicData" :key="inde" :label="ite.label"
-                                               :value="ite.value"></el-option>
-                                </el-select>
-                                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="costForm[item.prop]" size="small"
-                                          autocomplete="off" :disabled="item.disabled" :placeholder="'请输入' + item.label"></el-input>
-                                <el-input v-else type="age" style="width: 100%;" v-model.trim="costForm[item.prop]" size="small" autocomplete="off"
-                                          :disabled="item.disabled" clearable :placeholder="'请输入' + item.label"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                    <el-button @click="costVisible = false;">取 消</el-button>
-                    <el-button type="primary" @click="costcompanyConfirm">确 定</el-button>
-                </span>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {bfeesdefineDetail, bfeesdefineSubmit} from "@/api/iosBasicData/bfeesdefine";
-
-export default {
-    props:{
-        detailData: {
-            type: Object
-        }
-    },
-    data(){
-        return {
-            pageLoading:false,
-            saveLoading:false,
-            // 费用弹窗
-            costVisible:false,
-            // 费用弹窗绑定的数据
-            costForm:{},
-            costIndex:null,
-
-            // 获取到的数据
-            form:{
-                costList:[]
-            },
-            // 基础资料数据
-            basicData:{
-                column:[
-                    {
-                        label: "中文名称",
-                        prop: "cnName",
-                        rules: [{
-                            required: true,
-                            message: "请输入中文名称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "英文名称",
-                        prop: "enName",
-                        rules: [{
-                            required: true,
-                            message: "请输入英文名称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "状态",
-                        prop: "status",
-                        type:'select',
-                        dicData:[{
-                            label:'启用',
-                            value:0
-                        },{
-                            label:'停用',
-                            value:1
-                        }],
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        span:24,
-                        type: 'textarea',
-                        minRows: 3,
-                    },
-
-                ]
-            },
-            // 费用数据
-            costData:{
-                column:[
-                    {
-                        label: "费用编码",
-                        prop: "code",
-                        rules: [{
-                            required: true,
-                            message: "请输入费用编码",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "中文名称",
-                        prop: "cnName",
-                        rules: [{
-                            required: true,
-                            message: "请输入中文名称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "英文名称",
-                        prop: "enName",
-                        rules: [{
-                            required: true,
-                            message: "请输入英文名称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "计量单位",
-                        prop: "unitNo",
-                        rules: [{
-                            required: true,
-                            message: "请输入计量单位",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "币别",
-                        prop: "curNo",
-                        rules: [{
-                            required: true,
-                            message: "请输入币别",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "收付",
-                        prop: "dc",
-                        type:'select',
-                        dicData:[{
-                            label:'收',
-                            value:'D'
-                        },{
-                            label:'付',
-                            value:'C'
-                        }],
-                        rules: [{
-                            required: true,
-                            message: "请选择收付",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "财务核算要素名称",
-                        prop: "accElementName",
-                        rules: [{
-                            required: true,
-                            message: "请输入财务核算要素名称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "科目编号",
-                        prop: "accNo",
-                        rules: [{
-                            required: true,
-                            message: "请输入科目编号",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "科目全称",
-                        prop: "accFullName",
-                        rules: [{
-                            required: true,
-                            message: "请输入科目全称",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "备注",
-                        prop: "remarks",
-                        span:24,
-                        type: 'textarea',
-                        minRows: 3,
-                    },
-                ]
-            },
-        }
-    },
-    methods:{
-        // 获取详情数据
-        bfeesdefineDetailfun(id){
-            this.pageLoading = true
-            bfeesdefineDetail(id).then(res => {
-                this.form = res.data.data;
-                this.pageLoading = false
-            });
-        },
-        // 编辑按钮更改状态
-        editHandle(){
-            this.detailData.seeDisabled = false;
-        },
-        // 保存按钮
-        editCustomer(){
-            this.$refs.form.validate((valid)=>{
-                if (valid) {
-                    this.saveLoading = true
-                    this.bfeesdefineSubmitfun()
-                }else {
-                    return false;
-                }
-            })
-        },
-        // 保存接口
-        bfeesdefineSubmitfun(){
-            this.form.extendedData = JSON.stringify(this.form.extendedDataArr)
-            bfeesdefineSubmit(this.form).then((res)=>{
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                });
-                this.saveLoading = false
-                this.bfeesdefineDetailfun(res.data.data.id)
-                this.detailData.seeDisabled = true;
-            })
-        },
-
-        // 费用添加
-        costpingCompanyAdd(){
-            this.costVisible = true
-        },
-        // 费用编辑
-        costCompanyEdit(index,row){
-            this.costForm = JSON.parse(JSON.stringify(row))
-            this.costIndex = index
-            this.costVisible = true
-        },
-        // 费用删除
-        costCompanyDelete(index,row){
-            this.form.costList.splice(index,1)
-        },
-        // 费用确认
-        costcompanyConfirm(){
-            if (this.costIndex != null) {
-                this.form.costList.splice(this.costIndex,1,this.costForm)
-            }else {
-                this.form.costList.push(this.costForm)
-            }
-            this.costForm = {}
-            this.costIndex = null
-            this.costVisible = false
-        },
-        // 费用关闭
-        costClose(done){
-            this.$confirm('确认关闭?')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => {});
-        },
-        //返回列表
-        backToList() {
-            this.$emit('goBack')
-        },
-        // 更改表格颜色
-        headerClassName(tab){
-            //颜色间隔
-            let back = ""
-            if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                if (tab.columnIndex % 2 === 0) {
-                    back = "back-one"
-                } else if (tab.columnIndex % 2 === 1) {
-                    back = "back-two"
-                }
-            }
-            return back;
-        },
-    }
-}
-</script>
-
-<style scoped>
-::v-deep#out-table .back-one {
-    background: #ecf5ff !important;
-}
-::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
-}
-.borderless {
-    height: 100%;
-    box-sizing: border-box
-
-}
-.customer-main {
-//margin-top: 20px;
-//width: calc(100% - 140px);
-    margin-bottom: 15px;
-}
-.margintop {
-    margin-top: 10px;
-}
-::v-deep.el-form-item {
-    margin-bottom: 0;
-}
-.isShow {
-    display: none;
-}
-</style>

+ 377 - 0
src/views/iosBasicData/bfeesdefine/bfeesdetype.vue

@@ -0,0 +1,377 @@
+<template>
+    <basic-container>
+        <avue-crud :option="option"
+                   :table-loading="loading"
+                   :data="data"
+                   :page.sync="page"
+                   :permission="permissionList"
+                   id="out-table"
+                   :header-cell-class-name="headerClassName"
+                   :before-open="beforeOpen"
+                   v-model="form"
+                   ref="crud"
+                   @row-update="rowUpdate"
+                   @row-save="rowSave"
+                   @row-del="rowDel"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @selection-change="selectionChange"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 302.1)"
+                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 302.1)"
+                   @on-load="onLoad">
+            <template slot="menuLeft">
+                <el-button type="danger"
+                           size="small"
+                           icon="el-icon-delete"
+                           plain
+                           @click="handleDelete">删 除
+                </el-button>
+            </template>
+        </avue-crud>
+    </basic-container>
+</template>
+
+<script>
+  import {bfeesdefineList, bfeesdefineDetail, bfeesdefineSubmit, bfeesdefineRemove} from "@/api/iosBasicData/bfeesdefine";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option:{},
+        optionBack: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 24,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "中文名称",
+              prop: "cnName",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入中文名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "英文名称",
+              prop: "enName",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入英文名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "排序",
+              prop: "sort",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "版本",
+              prop: "version",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "状态",
+              prop: "status",
+                type:'select',
+                dicData:[{
+                    label:'启用',
+                    value:0
+                },{
+                    label:'停用',
+                    value:1
+                }],
+              rules: [{
+                required: true,
+                message: "请选择状态",
+                trigger: "blur"
+              }]
+            },
+              {
+                  label: "主键",
+                  prop: "id",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建人 Id",
+                  prop: "createUser",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建人",
+                  prop: "createUserName",
+                  display:false,
+              },
+              {
+                  label: "创建部门 Id",
+                  prop: "createDept",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "创建部门",
+                  prop: "createDeptName",
+                  display:false,
+              },
+              {
+                  label: "创建时间",
+                  prop: "createTime",
+                  width: 160,
+                  display:false,
+              },
+              {
+                  label: "修改人 Id",
+                  prop: "updateUser",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "修改人",
+                  prop: "updateUserName",
+                  display:false,
+              },
+              {
+                  label: "修改时间",
+                  prop: "updateTime",
+                  width:160,
+                  display:false,
+              },
+              {
+                  label: "父主键",
+                  prop: "parentId",
+                  hide:true,
+                  display:false,
+              },
+              {
+                  label: "祖籍列表",
+                  prop: "ancestors",
+                  hide:true,
+                  display:false,
+              },
+            {
+              label: "是否已删除(0 否 1是)",
+              prop: "isDeleted",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "备注",
+              prop: "remarks",
+                span:24,
+                type: 'textarea',
+                width: "180",
+                slot: true,
+                minRows: 3,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          // addBtn: this.vaildData(this.permission.bfeesdefine_add, false),
+          // viewBtn: this.vaildData(this.permission.bfeesdefine_view, false),
+          // delBtn: this.vaildData(this.permission.bfeesdefine_delete, false),
+          // editBtn: this.vaildData(this.permission.bfeesdefine_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+      async created() {
+          this.option = await this.getColumnData(this.getColumnName(302.1), this.optionBack);
+      },
+    methods: {
+
+      rowSave(row, done, loading) {
+        bfeesdefineSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        bfeesdefineSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return bfeesdefineRemove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return bfeesdefineRemove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          bfeesdefineDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        bfeesdefineList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab){
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+    }
+  };
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

+ 185 - 120
src/views/iosBasicData/bfeesdefine/index.vue

@@ -1,77 +1,82 @@
 <template>
-  <div>
-      <basic-container v-if="isShow">
-          <avue-crud :option="option"
-                     :table-loading="loading"
-                     :data="data"
-                     :page.sync="page"
-                     :permission="permissionList"
-                     id="out-table"
-                     :header-cell-class-name="headerClassName"
-                     :before-open="beforeOpen"
-                     v-model="form"
-                     ref="crud"
-                     @row-update="rowUpdate"
-                     @row-save="rowSave"
-                     @row-del="rowDel"
-                     @search-change="searchChange"
-                     @search-reset="searchReset"
-                     @selection-change="selectionChange"
-                     @current-change="currentChange"
-                     @size-change="sizeChange"
-                     @refresh-change="refreshChange"
-                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 302)"
-                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 302)"
-                     @on-load="onLoad">
-              <template slot="menuLeft">
-                  <el-button type="primary"
-                             size="small"
-                             icon="el-icon-plus"
-                             @click="addbtnfun()">新增
-                  </el-button>
-                  <el-button type="danger"
-                             size="small"
-                             icon="el-icon-delete"
-                             plain
-                             @click="handleDelete">删 除
-                  </el-button>
-              </template>
-              <template slot-scope="scope" slot="menu">
-                  <el-button
-                      :type="scope.type"
-                      :size="scope.size"
-                      icon="el-icon-edit"
-                      @click.stop="rowCellfun(scope.row, scope.index)"
-                  >编辑
-                  </el-button>
-                  <el-button
-                      :type="scope.type"
-                      :size="scope.size"
-                      icon="el-icon-delete"
-                      @click.stop="rowDel(scope.row, scope.index)"
-                  >删除
-                  </el-button>
-              </template>
-
-          </avue-crud>
-      </basic-container>
-
-      <bfeesde ref="bfeesde" v-if="!isShow" :detailData="detailData" @goBack="goBack"></bfeesde>
-  </div>
+    <div>
+        <el-row>
+            <el-col :span="5">
+                <div class="box">
+                    <el-scrollbar>
+                        <basic-container>
+                            <avue-tree :option="treeOption" :data="bfeesdefineType" @node-click="nodeClick" />
+                        </basic-container>
+                    </el-scrollbar>
+                </div>
+            </el-col>
+            <el-col :span="19">
+                <basic-container>
+                    <avue-crud :option="option"
+                               :table-loading="loading"
+                               :data="data"
+                               :page.sync="page"
+                               :permission="permissionList"
+                               id="out-table"
+                               :header-cell-class-name="headerClassName"
+                               :before-open="beforeOpen"
+                               v-model="form"
+                               ref="crud"
+                               @row-update="rowUpdate"
+                               @row-save="rowSave"
+                               @row-del="rowDel"
+                               @search-change="searchChange"
+                               @search-reset="searchReset"
+                               @selection-change="selectionChange"
+                               @current-change="currentChange"
+                               @size-change="sizeChange"
+                               @refresh-change="refreshChange"
+                               @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 302)"
+                               @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 302)"
+                               @on-load="onLoad">
+                        <template slot="menuLeft">
+                            <el-button type="danger"
+                                       size="small"
+                                       icon="el-icon-delete"
+                                       plain
+                                       @click="handleDelete">删 除
+                            </el-button>
+                        </template>
+                    </avue-crud>
+                </basic-container>
+            </el-col>
+        </el-row>
+    </div>
 </template>
 
 <script>
-  import {bfeesdefineList, bfeesdefineDetail, bfeesdefineSubmit, bfeesdefineRemove} from "@/api/iosBasicData/bfeesdefine";
+  import {bfeesList, bfeesDetail, bfeesSubmit, bfeesRemove} from "@/api/iosBasicData/bfees";
   import {mapGetters} from "vuex";
-  import bfeesde from "@/views/iosBasicData/bfeesdefine/bfeesde.vue";
+  import {bfeesdefineList} from "@/api/iosBasicData/bfeesdefine";
+  import {getDeptLazyTree} from "@/api/basicData/customerInformation";
+  import {CDParameter, customerParameter} from "@/enums/management-type";
 
   export default {
-      components: {bfeesde},
     data() {
       return {
-          // 详情传递的数据
-          detailData:{},
-          isShow:true, // 详情和列表切换
+          // 费用类别数据
+          bfeesdefineType:[],
+          treeOption: {
+              nodeKey: "id",
+              lazy: true,
+              treeLoad: function(node, resolve) {
+                  const parentId = node.level === 0 ? 0 : node.data.id;
+              },
+              addBtn: false,
+              menu: false,
+              size: "small",
+              props: {
+                  labelText: "标题",
+                  label: "cnName",
+                  value: "value",
+                  children: "children"
+              }
+          },
 
         form: {},
         query: {},
@@ -96,6 +101,16 @@
           dialogClickModal: false,
           column: [
             {
+              label: "费用编码",
+              prop: "code",
+                search: true,
+              rules: [{
+                required: true,
+                message: "请输入费用编码",
+                trigger: "blur"
+              }]
+            },
+            {
               label: "中文名称",
               prop: "cnName",
                 search: true,
@@ -116,12 +131,90 @@
               }]
             },
             {
-              label: "排序",
-              prop: "sort",
+                label: "费用类别",
+                prop: "feesTypeName",
+
+                rules: [{
+                      required: true,
+                      message: "请选择费用类别",
+                      trigger: "blur"
+                }]
+            },
+            {
+              label: "计量单位",
+              prop: "unitNo",
+              rules: [{
+                required: true,
+                message: "请输入计量单位",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "币别",
+              prop: "curNo",
+              rules: [{
+                required: true,
+                message: "请输入币别",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "收付",
+              prop: "dc",
+                type:'select',
+                dicData:[{
+                    label:'收',
+                    value:'D'
+                },{
+                    label:'付',
+                    value:'C'
+                }],
+              rules: [{
+                required: true,
+                message: "请输入收付",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "财务核算要素 Id",
+              prop: "accElementId",
                 hide:true,
                 display:false,
             },
             {
+              label: "财务核算要素名称",
+              prop: "accElementName",
+              rules: [{
+                required: true,
+                message: "请输入财务核算要素名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "科目 Id",
+              prop: "accId",
+                hide:true,
+                display:false,
+            },
+            {
+              label: "科目编号",
+              prop: "accNo",
+              rules: [{
+                required: true,
+                message: "请输入科目编号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "科目全称",
+              prop: "accFullName",
+              rules: [{
+                required: true,
+                message: "请输入科目全称",
+                trigger: "blur"
+              }]
+            },
+            {
               label: "版本",
               prop: "version",
                 hide:true,
@@ -140,7 +233,7 @@
                 }],
               rules: [{
                 required: true,
-                message: "请选择状态",
+                message: "请输入状态",
                 trigger: "blur"
               }]
             },
@@ -175,7 +268,6 @@
               {
                   label: "创建时间",
                   prop: "createTime",
-                  width: 160,
                   display:false,
               },
               {
@@ -195,18 +287,6 @@
                   width:160,
                   display:false,
               },
-              {
-                  label: "父主键",
-                  prop: "parentId",
-                  hide:true,
-                  display:false,
-              },
-              {
-                  label: "祖籍列表",
-                  prop: "ancestors",
-                  hide:true,
-                  display:false,
-              },
             {
               label: "是否已删除(0 否 1是)",
               prop: "isDeleted",
@@ -231,10 +311,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.bfeesdefine_add, false),
-          viewBtn: this.vaildData(this.permission.bfeesdefine_view, false),
-          delBtn: this.vaildData(this.permission.bfeesdefine_delete, false),
-          editBtn: this.vaildData(this.permission.bfeesdefine_edit, false)
+          // addBtn: this.vaildData(this.permission.bfees_add, false),
+          // viewBtn: this.vaildData(this.permission.bfees_view, false),
+          // delBtn: this.vaildData(this.permission.bfees_delete, false),
+          // editBtn: this.vaildData(this.permission.bfees_edit, false)
         };
       },
       ids() {
@@ -247,42 +327,25 @@
     },
       async created() {
           this.option = await this.getColumnData(this.getColumnName(302), this.optionBack);
+          this.bfeesdefineListfun()
       },
     methods: {
-        // 详情的返回列表
-        goBack(){
-            // 初始化数据
-            // this.detailData = this.$options.data().detailData;
-            if (JSON.stringify(this.$route.query) != "{}") {
-                this.$router.$avueRouter.closeTag();
-                this.$router.push({
-                    path: "/iosBasicData/bfeesdefine/index"
-                });
-            }
-            this.isShow = true;
-            this.onLoad(this.page, this.search);
-        },
-        // 添加弹窗开启
-        addbtnfun(){
-            this.detailData = {
-                seeDisabled: false,
-            };
-            this.isShow = false
-        },
-        // 编辑详情打开
-        rowCellfun(row,index){
-            this.detailData = {
-                seeDisabled: true,
-                id: row.id
-            };
-            this.isShow = false
-            this.$nextTick(()=>{
-                this.$refs.bfeesde.bfeesdefineDetailfun(row.id)
+        // 获取费用类别数据
+        bfeesdefineListfun(){
+            bfeesdefineList(1,10).then(res=>{
+                this.bfeesdefineType = res.data.data.records
+                console.log(res,304)
             })
         },
+        nodeClick(data) {
+            console.log(data,331)
+            // this.feesTypeId = data.id;
+            // this.page.currentPage = 1;
+            // this.onLoad(this.page);
+        },
 
       rowSave(row, done, loading) {
-        bfeesdefineSubmit(row).then(() => {
+        bfeesSubmit(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -295,7 +358,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
-        bfeesdefineSubmit(row).then(() => {
+        bfeesSubmit(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -314,7 +377,7 @@
           type: "warning"
         })
           .then(() => {
-            return bfeesdefineRemove(row.id);
+            return bfeesRemove(row.id);
           })
           .then(() => {
             this.onLoad(this.page);
@@ -335,7 +398,7 @@
           type: "warning"
         })
           .then(() => {
-            return bfeesdefineRemove(this.ids);
+            return bfeesRemove(this.ids);
           })
           .then(() => {
             this.onLoad(this.page);
@@ -348,7 +411,7 @@
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
-          bfeesdefineDetail(this.form.id).then(res => {
+          bfeesDetail(this.form.id).then(res => {
             this.form = res.data.data;
           });
         }
@@ -382,7 +445,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        bfeesdefineList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        bfeesList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;
@@ -390,6 +453,7 @@
           this.selectionClear();
         });
       },
+
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {
             /**
@@ -426,6 +490,7 @@
             }
             return back;
         },
+
     }
   };
 </script>