Browse Source

费用协议生成文件

dongyongwei 4 years ago
parent
commit
e862b4b280

+ 53 - 0
src/api/feeagreement/WarehouseFeeAgreementType.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询费用协议主表列表
+export function listWarehouseFeeAgreementType(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用协议主表详细
+export function getWarehouseFeeAgreementType(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增费用协议主表
+export function addWarehouseFeeAgreementType(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用协议主表
+export function updateWarehouseFeeAgreementType(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用协议主表
+export function delWarehouseFeeAgreementType(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出费用协议主表
+export function exportWarehouseFeeAgreementType(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementType/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/feeagreement/WarehouseFeeAgreementTypeBusiness.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询费用协议从表列表
+export function listWarehouseFeeAgreementTypeBusiness(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用协议从表详细
+export function getWarehouseFeeAgreementTypeBusiness(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增费用协议从表
+export function addWarehouseFeeAgreementTypeBusiness(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用协议从表
+export function updateWarehouseFeeAgreementTypeBusiness(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用协议从表
+export function delWarehouseFeeAgreementTypeBusiness(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出费用协议从表
+export function exportWarehouseFeeAgreementTypeBusiness(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusiness/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/feeagreement/WarehouseFeeAgreementTypeBusinessDetail.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询费用协议从从表列表
+export function listWarehouseFeeAgreementTypeBusinessDetail(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用协议从从表详细
+export function getWarehouseFeeAgreementTypeBusinessDetail(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增费用协议从从表
+export function addWarehouseFeeAgreementTypeBusinessDetail(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用协议从从表
+export function updateWarehouseFeeAgreementTypeBusinessDetail(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用协议从从表
+export function delWarehouseFeeAgreementTypeBusinessDetail(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出费用协议从从表
+export function exportWarehouseFeeAgreementTypeBusinessDetail(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询费用协议从从从列表
+export function listWarehouseFeeAgreementTypeBusinessDetailFormula(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用协议从从从详细
+export function getWarehouseFeeAgreementTypeBusinessDetailFormula(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增费用协议从从从
+export function addWarehouseFeeAgreementTypeBusinessDetailFormula(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用协议从从从
+export function updateWarehouseFeeAgreementTypeBusinessDetailFormula(data) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用协议从从从
+export function delWarehouseFeeAgreementTypeBusinessDetailFormula(fId) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出费用协议从从从
+export function exportWarehouseFeeAgreementTypeBusinessDetailFormula(query) {
+  return request({
+    url: '/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula/export',
+    method: 'get',
+    params: query
+  })
+}

+ 53 - 0
src/api/feeagreement/feeagreementtype.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询费用协议类型列表
+export function listFeeagreementtype(query) {
+  return request({
+    url: '/feeagreement/feeagreementtype/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用协议类型详细
+export function getFeeagreementtype(fId) {
+  return request({
+    url: '/feeagreement/feeagreementtype/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增费用协议类型
+export function addFeeagreementtype(data) {
+  return request({
+    url: '/feeagreement/feeagreementtype',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用协议类型
+export function updateFeeagreementtype(data) {
+  return request({
+    url: '/feeagreement/feeagreementtype',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用协议类型
+export function delFeeagreementtype(fId) {
+  return request({
+    url: '/feeagreement/feeagreementtype/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出费用协议类型
+export function exportFeeagreementtype(query) {
+  return request({
+    url: '/feeagreement/feeagreementtype/export',
+    method: 'get',
+    params: query
+  })
+}

+ 416 - 0
src/views/feeagreement/WarehouseFeeAgreementType/index.vue

@@ -0,0 +1,416 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="客户名称" prop="fCorpId">
+        <el-input
+          v-model="queryParams.fCorpId"
+          placeholder="请输入客户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分类类型ID" prop="fTFeeAgreementTypeFId">
+        <el-input
+          v-model="queryParams.fTFeeAgreementTypeFId"
+          placeholder="请输入分类类型ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效期起" prop="fBegindate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fBegindate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择有效期起">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效期至" prop="fEnddate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fEnddate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择有效期至">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="fCreateBy">
+        <el-input
+          v-model="queryParams.fCreateBy"
+          placeholder="请输入创建人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="fCreateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人ID" prop="fUpdateBy">
+        <el-input
+          v-model="queryParams.fUpdateBy"
+          placeholder="请输入更新人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="fUpdateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fUpdateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除状态" prop="fDelFlag">
+        <el-input
+          v-model="queryParams.fDelFlag"
+          placeholder="请输入删除状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementType:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementType:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementType:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementType:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="WarehouseFeeAgreementTypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="fId" />
+      <el-table-column label="客户名称" align="center" prop="fCorpId" />
+      <el-table-column label="分类类型ID" align="center" prop="fTFeeAgreementTypeFId" />
+      <el-table-column label="有效期起" align="center" prop="fBegindate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fBegindate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期至" align="center" prop="fEnddate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="fRemark" />
+      <el-table-column label="创建人ID" align="center" prop="fCreateBy" />
+      <el-table-column label="创建日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人ID" align="center" prop="fUpdateBy" />
+      <el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementType:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementType:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用协议主表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="客户名称" prop="fCorpId">
+          <el-input v-model="form.fCorpId" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="分类类型ID" prop="fTFeeAgreementTypeFId">
+          <el-input v-model="form.fTFeeAgreementTypeFId" placeholder="请输入分类类型ID" />
+        </el-form-item>
+        <el-form-item label="有效期起" prop="fBegindate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fBegindate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择有效期起">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="有效期至" prop="fEnddate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fEnddate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择有效期至">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
+          <el-input v-model="form.fRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="fCreateBy">
+          <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="创建日期" prop="fCreateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人ID" prop="fUpdateBy">
+          <el-input v-model="form.fUpdateBy" placeholder="请输入更新人ID" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="fUpdateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="fDelFlag">
+          <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouseFeeAgreementType, getWarehouseFeeAgreementType, delWarehouseFeeAgreementType, addWarehouseFeeAgreementType, updateWarehouseFeeAgreementType, exportWarehouseFeeAgreementType } from "@/api/feeagreement/WarehouseFeeAgreementType";
+
+export default {
+  name: "WarehouseFeeAgreementType",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用协议主表表格数据
+      WarehouseFeeAgreementTypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fCorpId: null,
+        fTFeeAgreementTypeFId: null,
+        fBegindate: null,
+        fEnddate: null,
+        fRemark: null,
+        fCreateBy: null,
+        fCreateTime: null,
+        fUpdateBy: null,
+        fUpdateTime: null,
+        fDelFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fCorpId: [
+          { required: true, message: "客户名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询费用协议主表列表 */
+    getList() {
+      this.loading = true;
+      listWarehouseFeeAgreementType(this.queryParams).then(response => {
+        this.WarehouseFeeAgreementTypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fCorpId: null,
+        fTFeeAgreementTypeFId: null,
+        fBegindate: null,
+        fEnddate: null,
+        fRemark: null,
+        fCreateBy: null,
+        fCreateTime: null,
+        fUpdateBy: null,
+        fUpdateTime: null,
+        fDelFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用协议主表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getWarehouseFeeAgreementType(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用协议主表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateWarehouseFeeAgreementType(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWarehouseFeeAgreementType(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除费用协议主表编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delWarehouseFeeAgreementType(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有费用协议主表数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWarehouseFeeAgreementType(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 462 - 0
src/views/feeagreement/WarehouseFeeAgreementTypeBusiness/index.vue

@@ -0,0 +1,462 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeFId"
+          placeholder="请输入主表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分类类型ID" prop="fTFeeAgreementTypeFId">
+        <el-input
+          v-model="queryParams.fTFeeAgreementTypeFId"
+          placeholder="请输入分类类型ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="业务类型父ID" prop="fTFeeAgreementFTypeParentId">
+        <el-input
+          v-model="queryParams.fTFeeAgreementFTypeParentId"
+          placeholder="请输入业务类型父ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="费目" prop="fFeeItem">
+        <el-input
+          v-model="queryParams.fFeeItem"
+          placeholder="请输入费目"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计算方法" prop="fComputingMethod">
+        <el-input
+          v-model="queryParams.fComputingMethod"
+          placeholder="请输入计算方法"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收付类型" prop="fReceiptPaymentType">
+        <el-input
+          v-model="queryParams.fReceiptPaymentType"
+          placeholder="请输入收付类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="取值" prop="fGetValue">
+        <el-select v-model="queryParams.fGetValue" placeholder="请选择取值" clearable size="small">
+          <el-option
+            v-for="dict in fGetValueOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="删除状态" prop="fDelFlag">
+        <el-input
+          v-model="queryParams.fDelFlag"
+          placeholder="请输入删除状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="fUpdateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fUpdateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人ID" prop="fUpdateBy">
+        <el-input
+          v-model="queryParams.fUpdateBy"
+          placeholder="请输入更新人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="fCreateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="fCreateBy">
+        <el-input
+          v-model="queryParams.fCreateBy"
+          placeholder="请输入创建人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="WarehouseFeeAgreementTypeBusinessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="fId" />
+      <el-table-column label="主表id" align="center" prop="fWarehouseFeeAgreementTypeFId" />
+      <el-table-column label="分类类型ID" align="center" prop="fTFeeAgreementTypeFId" />
+      <el-table-column label="业务类型父ID" align="center" prop="fTFeeAgreementFTypeParentId" />
+      <el-table-column label="费目" align="center" prop="fFeeItem" />
+      <el-table-column label="计算方法" align="center" prop="fComputingMethod" />
+      <el-table-column label="收付类型" align="center" prop="fReceiptPaymentType" />
+      <el-table-column label="取值" align="center" prop="fGetValue" :formatter="fGetValueFormat" />
+      <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人ID" align="center" prop="fUpdateBy" />
+      <el-table-column label="创建日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人ID" align="center" prop="fCreateBy" />
+      <el-table-column label="备注" align="center" prop="fRemark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusiness:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用协议从表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeFId" placeholder="请输入主表id" />
+        </el-form-item>
+        <el-form-item label="分类类型ID" prop="fTFeeAgreementTypeFId">
+          <el-input v-model="form.fTFeeAgreementTypeFId" placeholder="请输入分类类型ID" />
+        </el-form-item>
+        <el-form-item label="业务类型父ID" prop="fTFeeAgreementFTypeParentId">
+          <el-input v-model="form.fTFeeAgreementFTypeParentId" placeholder="请输入业务类型父ID" />
+        </el-form-item>
+        <el-form-item label="费目" prop="fFeeItem">
+          <el-input v-model="form.fFeeItem" placeholder="请输入费目" />
+        </el-form-item>
+        <el-form-item label="计算方法" prop="fComputingMethod">
+          <el-input v-model="form.fComputingMethod" placeholder="请输入计算方法" />
+        </el-form-item>
+        <el-form-item label="收付类型" prop="fReceiptPaymentType">
+          <el-input v-model="form.fReceiptPaymentType" placeholder="请输入收付类型" />
+        </el-form-item>
+        <el-form-item label="取值" prop="fGetValue">
+          <el-select v-model="form.fGetValue" placeholder="请选择取值">
+            <el-option
+              v-for="dict in fGetValueOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="fDelFlag">
+          <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="fUpdateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人ID" prop="fUpdateBy">
+          <el-input v-model="form.fUpdateBy" placeholder="请输入更新人ID" />
+        </el-form-item>
+        <el-form-item label="创建日期" prop="fCreateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="fCreateBy">
+          <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
+          <el-input v-model="form.fRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouseFeeAgreementTypeBusiness, getWarehouseFeeAgreementTypeBusiness, delWarehouseFeeAgreementTypeBusiness, addWarehouseFeeAgreementTypeBusiness, updateWarehouseFeeAgreementTypeBusiness, exportWarehouseFeeAgreementTypeBusiness } from "@/api/feeagreement/WarehouseFeeAgreementTypeBusiness";
+
+export default {
+  name: "WarehouseFeeAgreementTypeBusiness",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用协议从表表格数据
+      WarehouseFeeAgreementTypeBusinessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 取值字典
+      fGetValueOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseFeeAgreementTypeFId: null,
+        fTFeeAgreementTypeFId: null,
+        fTFeeAgreementFTypeParentId: null,
+        fFeeItem: null,
+        fComputingMethod: null,
+        fReceiptPaymentType: null,
+        fGetValue: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fWarehouseFeeAgreementTypeFId: [
+          { required: true, message: "主表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("fee_agreement_get_value").then(response => {
+      this.fGetValueOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询费用协议从表列表 */
+    getList() {
+      this.loading = true;
+      listWarehouseFeeAgreementTypeBusiness(this.queryParams).then(response => {
+        this.WarehouseFeeAgreementTypeBusinessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取值字典翻译
+    fGetValueFormat(row, column) {
+      return this.selectDictLabel(this.fGetValueOptions, row.fGetValue);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fWarehouseFeeAgreementTypeFId: null,
+        fTFeeAgreementTypeFId: null,
+        fTFeeAgreementFTypeParentId: null,
+        fFeeItem: null,
+        fComputingMethod: null,
+        fReceiptPaymentType: null,
+        fGetValue: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用协议从表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getWarehouseFeeAgreementTypeBusiness(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用协议从表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateWarehouseFeeAgreementTypeBusiness(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWarehouseFeeAgreementTypeBusiness(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除费用协议从表编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delWarehouseFeeAgreementTypeBusiness(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有费用协议从表数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWarehouseFeeAgreementTypeBusiness(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 558 - 0
src/views/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/index.vue

@@ -0,0 +1,558 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeFId"
+          placeholder="请输入主表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="从表id" prop="fWarehouseFeeAgreementTypeBusinessFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeBusinessFId"
+          placeholder="请输入从表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计价单位" prop="fFeeUnitId">
+        <el-select v-model="queryParams.fFeeUnitId" placeholder="请选择计价单位" clearable size="small">
+          <el-option
+            v-for="dict in fFeeUnitIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="免费部分" prop="fFreeNum">
+        <el-input
+          v-model="queryParams.fFreeNum"
+          placeholder="请输入免费部分"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="尺寸" prop="fSize">
+        <el-input
+          v-model="queryParams.fSize"
+          placeholder="请输入尺寸"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="箱型" prop="fBoxModel">
+        <el-select v-model="queryParams.fBoxModel" placeholder="请选择箱型" clearable size="small">
+          <el-option
+            v-for="dict in fBoxModelOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数量" prop="fNum">
+        <el-input
+          v-model="queryParams.fNum"
+          placeholder="请输入数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单价" prop="fPrice">
+        <el-input
+          v-model="queryParams.fPrice"
+          placeholder="请输入单价"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="币种" prop="fCurrency">
+        <el-select v-model="queryParams.fCurrency" placeholder="请选择币种" clearable size="small">
+          <el-option
+            v-for="dict in fCurrencyOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否包干 Y是N否" prop="fIsContract">
+        <el-select v-model="queryParams.fIsContract" placeholder="请选择是否包干 Y是N否" clearable size="small">
+          <el-option
+            v-for="dict in fIsContractOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="删除状态" prop="fDelFlag">
+        <el-input
+          v-model="queryParams.fDelFlag"
+          placeholder="请输入删除状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="fUpdateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fUpdateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人ID" prop="fUpdateBy">
+        <el-input
+          v-model="queryParams.fUpdateBy"
+          placeholder="请输入更新人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="fCreateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="fCreateBy">
+        <el-input
+          v-model="queryParams.fCreateBy"
+          placeholder="请输入创建人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="WarehouseFeeAgreementTypeBusinessDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="fId" />
+      <el-table-column label="主表id" align="center" prop="fWarehouseFeeAgreementTypeFId" />
+      <el-table-column label="从表id" align="center" prop="fWarehouseFeeAgreementTypeBusinessFId" />
+      <el-table-column label="计价单位" align="center" prop="fFeeUnitId" :formatter="fFeeUnitIdFormat" />
+      <el-table-column label="免费部分" align="center" prop="fFreeNum" />
+      <el-table-column label="尺寸" align="center" prop="fSize" />
+      <el-table-column label="箱型" align="center" prop="fBoxModel" :formatter="fBoxModelFormat" />
+      <el-table-column label="数量" align="center" prop="fNum" />
+      <el-table-column label="单价" align="center" prop="fPrice" />
+      <el-table-column label="币种" align="center" prop="fCurrency" :formatter="fCurrencyFormat" />
+      <el-table-column label="是否包干 Y是N否" align="center" prop="fIsContract" :formatter="fIsContractFormat" />
+      <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人ID" align="center" prop="fUpdateBy" />
+      <el-table-column label="创建日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人ID" align="center" prop="fCreateBy" />
+      <el-table-column label="备注" align="center" prop="fRemark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用协议从从表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeFId" placeholder="请输入主表id" />
+        </el-form-item>
+        <el-form-item label="从表id" prop="fWarehouseFeeAgreementTypeBusinessFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeBusinessFId" placeholder="请输入从表id" />
+        </el-form-item>
+        <el-form-item label="计价单位" prop="fFeeUnitId">
+          <el-select v-model="form.fFeeUnitId" placeholder="请选择计价单位">
+            <el-option
+              v-for="dict in fFeeUnitIdOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="免费部分" prop="fFreeNum">
+          <el-input v-model="form.fFreeNum" placeholder="请输入免费部分" />
+        </el-form-item>
+        <el-form-item label="尺寸" prop="fSize">
+          <el-input v-model="form.fSize" placeholder="请输入尺寸" />
+        </el-form-item>
+        <el-form-item label="箱型" prop="fBoxModel">
+          <el-select v-model="form.fBoxModel" placeholder="请选择箱型">
+            <el-option
+              v-for="dict in fBoxModelOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数量" prop="fNum">
+          <el-input v-model="form.fNum" placeholder="请输入数量" />
+        </el-form-item>
+        <el-form-item label="单价" prop="fPrice">
+          <el-input v-model="form.fPrice" placeholder="请输入单价" />
+        </el-form-item>
+        <el-form-item label="币种" prop="fCurrency">
+          <el-select v-model="form.fCurrency" placeholder="请选择币种">
+            <el-option
+              v-for="dict in fCurrencyOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否包干 Y是N否" prop="fIsContract">
+          <el-select v-model="form.fIsContract" placeholder="请选择是否包干 Y是N否">
+            <el-option
+              v-for="dict in fIsContractOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="fDelFlag">
+          <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="fUpdateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人ID" prop="fUpdateBy">
+          <el-input v-model="form.fUpdateBy" placeholder="请输入更新人ID" />
+        </el-form-item>
+        <el-form-item label="创建日期" prop="fCreateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="fCreateBy">
+          <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
+          <el-input v-model="form.fRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouseFeeAgreementTypeBusinessDetail, getWarehouseFeeAgreementTypeBusinessDetail, delWarehouseFeeAgreementTypeBusinessDetail, addWarehouseFeeAgreementTypeBusinessDetail, updateWarehouseFeeAgreementTypeBusinessDetail, exportWarehouseFeeAgreementTypeBusinessDetail } from "@/api/feeagreement/WarehouseFeeAgreementTypeBusinessDetail";
+
+export default {
+  name: "WarehouseFeeAgreementTypeBusinessDetail",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用协议从从表表格数据
+      WarehouseFeeAgreementTypeBusinessDetailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 计价单位字典
+      fFeeUnitIdOptions: [],
+      // 箱型字典
+      fBoxModelOptions: [],
+      // 币种字典
+      fCurrencyOptions: [],
+      // 是否包干 Y是N否字典
+      fIsContractOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseFeeAgreementTypeFId: null,
+        fWarehouseFeeAgreementTypeBusinessFId: null,
+        fFeeUnitId: null,
+        fFreeNum: null,
+        fSize: null,
+        fBoxModel: null,
+        fNum: null,
+        fPrice: null,
+        fCurrency: null,
+        fIsContract: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fWarehouseFeeAgreementTypeFId: [
+          { required: true, message: "主表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("fee_agreement_unit").then(response => {
+      this.fFeeUnitIdOptions = response.data;
+    });
+    this.getDicts("data_cntrId").then(response => {
+      this.fBoxModelOptions = response.data;
+    });
+    this.getDicts("currency").then(response => {
+      this.fCurrencyOptions = response.data;
+    });
+    this.getDicts("sys_yes_no").then(response => {
+      this.fIsContractOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询费用协议从从表列表 */
+    getList() {
+      this.loading = true;
+      listWarehouseFeeAgreementTypeBusinessDetail(this.queryParams).then(response => {
+        this.WarehouseFeeAgreementTypeBusinessDetailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 计价单位字典翻译
+    fFeeUnitIdFormat(row, column) {
+      return this.selectDictLabel(this.fFeeUnitIdOptions, row.fFeeUnitId);
+    },
+    // 箱型字典翻译
+    fBoxModelFormat(row, column) {
+      return this.selectDictLabel(this.fBoxModelOptions, row.fBoxModel);
+    },
+    // 币种字典翻译
+    fCurrencyFormat(row, column) {
+      return this.selectDictLabel(this.fCurrencyOptions, row.fCurrency);
+    },
+    // 是否包干 Y是N否字典翻译
+    fIsContractFormat(row, column) {
+      return this.selectDictLabel(this.fIsContractOptions, row.fIsContract);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fWarehouseFeeAgreementTypeFId: null,
+        fWarehouseFeeAgreementTypeBusinessFId: null,
+        fFeeUnitId: null,
+        fFreeNum: null,
+        fSize: null,
+        fBoxModel: null,
+        fNum: null,
+        fPrice: null,
+        fCurrency: null,
+        fIsContract: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用协议从从表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getWarehouseFeeAgreementTypeBusinessDetail(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用协议从从表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateWarehouseFeeAgreementTypeBusinessDetail(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWarehouseFeeAgreementTypeBusinessDetail(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除费用协议从从表编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delWarehouseFeeAgreementTypeBusinessDetail(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有费用协议从从表数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWarehouseFeeAgreementTypeBusinessDetail(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 470 - 0
src/views/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula/index.vue

@@ -0,0 +1,470 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeFId"
+          placeholder="请输入主表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="从表id" prop="fWarehouseFeeAgreementTypeBusinessFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeBusinessFId"
+          placeholder="请输入从表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="从从表id" prop="fWarehouseFeeAgreementTypeBusinessDetailFId">
+        <el-input
+          v-model="queryParams.fWarehouseFeeAgreementTypeBusinessDetailFId"
+          placeholder="请输入从从表id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="属性" prop="fAttribute">
+        <el-select v-model="queryParams.fAttribute" placeholder="请选择属性" clearable size="small">
+          <el-option
+            v-for="dict in fAttributeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="公式" prop="fFormula">
+        <el-select v-model="queryParams.fFormula" placeholder="请选择公式" clearable size="small">
+          <el-option
+            v-for="dict in fFormulaOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="值" prop="fValue">
+        <el-input
+          v-model="queryParams.fValue"
+          placeholder="请输入值"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="删除状态" prop="fDelFlag">
+        <el-input
+          v-model="queryParams.fDelFlag"
+          placeholder="请输入删除状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="fUpdateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fUpdateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人ID" prop="fUpdateBy">
+        <el-input
+          v-model="queryParams.fUpdateBy"
+          placeholder="请输入更新人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="fCreateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="fCreateBy">
+        <el-input
+          v-model="queryParams.fCreateBy"
+          placeholder="请输入创建人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="WarehouseFeeAgreementTypeBusinessDetailFormulaList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="fId" />
+      <el-table-column label="主表id" align="center" prop="fWarehouseFeeAgreementTypeFId" />
+      <el-table-column label="从表id" align="center" prop="fWarehouseFeeAgreementTypeBusinessFId" />
+      <el-table-column label="从从表id" align="center" prop="fWarehouseFeeAgreementTypeBusinessDetailFId" />
+      <el-table-column label="属性" align="center" prop="fAttribute" :formatter="fAttributeFormat" />
+      <el-table-column label="公式" align="center" prop="fFormula" :formatter="fFormulaFormat" />
+      <el-table-column label="值" align="center" prop="fValue" />
+      <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人ID" align="center" prop="fUpdateBy" />
+      <el-table-column label="创建日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人ID" align="center" prop="fCreateBy" />
+      <el-table-column label="备注" align="center" prop="fRemark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetailFormula:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用协议从从从对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主表id" prop="fWarehouseFeeAgreementTypeFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeFId" placeholder="请输入主表id" />
+        </el-form-item>
+        <el-form-item label="从表id" prop="fWarehouseFeeAgreementTypeBusinessFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeBusinessFId" placeholder="请输入从表id" />
+        </el-form-item>
+        <el-form-item label="从从表id" prop="fWarehouseFeeAgreementTypeBusinessDetailFId">
+          <el-input v-model="form.fWarehouseFeeAgreementTypeBusinessDetailFId" placeholder="请输入从从表id" />
+        </el-form-item>
+        <el-form-item label="属性" prop="fAttribute">
+          <el-select v-model="form.fAttribute" placeholder="请选择属性">
+            <el-option
+              v-for="dict in fAttributeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="公式" prop="fFormula">
+          <el-select v-model="form.fFormula" placeholder="请选择公式">
+            <el-option
+              v-for="dict in fFormulaOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="值" prop="fValue">
+          <el-input v-model="form.fValue" placeholder="请输入值" />
+        </el-form-item>
+        <el-form-item label="删除状态" prop="fDelFlag">
+          <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="fUpdateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人ID" prop="fUpdateBy">
+          <el-input v-model="form.fUpdateBy" placeholder="请输入更新人ID" />
+        </el-form-item>
+        <el-form-item label="创建日期" prop="fCreateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="fCreateBy">
+          <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
+          <el-input v-model="form.fRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouseFeeAgreementTypeBusinessDetailFormula, getWarehouseFeeAgreementTypeBusinessDetailFormula, delWarehouseFeeAgreementTypeBusinessDetailFormula, addWarehouseFeeAgreementTypeBusinessDetailFormula, updateWarehouseFeeAgreementTypeBusinessDetailFormula, exportWarehouseFeeAgreementTypeBusinessDetailFormula } from "@/api/feeagreement/WarehouseFeeAgreementTypeBusinessDetailFormula";
+
+export default {
+  name: "WarehouseFeeAgreementTypeBusinessDetailFormula",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用协议从从从表格数据
+      WarehouseFeeAgreementTypeBusinessDetailFormulaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 属性字典
+      fAttributeOptions: [],
+      // 公式字典
+      fFormulaOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fWarehouseFeeAgreementTypeFId: null,
+        fWarehouseFeeAgreementTypeBusinessFId: null,
+        fWarehouseFeeAgreementTypeBusinessDetailFId: null,
+        fAttribute: null,
+        fFormula: null,
+        fValue: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fWarehouseFeeAgreementTypeFId: [
+          { required: true, message: "主表id不能为空", trigger: "blur" }
+        ],
+        fWarehouseFeeAgreementTypeBusinessFId: [
+          { required: true, message: "从表id不能为空", trigger: "blur" }
+        ],
+        fWarehouseFeeAgreementTypeBusinessDetailFId: [
+          { required: true, message: "从从表id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("fee_agreement_attribute").then(response => {
+      this.fAttributeOptions = response.data;
+    });
+    this.getDicts("fee_agreement_formula").then(response => {
+      this.fFormulaOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询费用协议从从从列表 */
+    getList() {
+      this.loading = true;
+      listWarehouseFeeAgreementTypeBusinessDetailFormula(this.queryParams).then(response => {
+        this.WarehouseFeeAgreementTypeBusinessDetailFormulaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 属性字典翻译
+    fAttributeFormat(row, column) {
+      return this.selectDictLabel(this.fAttributeOptions, row.fAttribute);
+    },
+    // 公式字典翻译
+    fFormulaFormat(row, column) {
+      return this.selectDictLabel(this.fFormulaOptions, row.fFormula);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fWarehouseFeeAgreementTypeFId: null,
+        fWarehouseFeeAgreementTypeBusinessFId: null,
+        fWarehouseFeeAgreementTypeBusinessDetailFId: null,
+        fAttribute: null,
+        fFormula: null,
+        fValue: null,
+        fDelFlag: null,
+        fUpdateTime: null,
+        fUpdateBy: null,
+        fCreateTime: null,
+        fCreateBy: null,
+        fRemark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用协议从从从";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getWarehouseFeeAgreementTypeBusinessDetailFormula(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用协议从从从";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateWarehouseFeeAgreementTypeBusinessDetailFormula(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWarehouseFeeAgreementTypeBusinessDetailFormula(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除费用协议从从从编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delWarehouseFeeAgreementTypeBusinessDetailFormula(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有费用协议从从从数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportWarehouseFeeAgreementTypeBusinessDetailFormula(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 367 - 0
src/views/feeagreement/feeagreementtype/index.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="父ID" prop="fParentId">
+        <el-input
+          v-model="queryParams.fParentId"
+          placeholder="请输入父ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="费用协议类别名称" prop="fName">
+        <el-input
+          v-model="queryParams.fName"
+          placeholder="请输入费用协议类别名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="fCreateBy">
+        <el-input
+          v-model="queryParams.fCreateBy"
+          placeholder="请输入创建人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建日期" prop="fCreateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fCreateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新人ID" prop="fUpdateBy">
+        <el-input
+          v-model="queryParams.fUpdateBy"
+          placeholder="请输入更新人ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="fUpdateTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.fUpdateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除状态" prop="fDelFlag">
+        <el-input
+          v-model="queryParams.fDelFlag"
+          placeholder="请输入删除状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['feeagreement:feeagreementtype:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['feeagreement:feeagreementtype:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['feeagreement:feeagreementtype:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['feeagreement:feeagreementtype:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="feeagreementtypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="fId" />
+      <el-table-column label="父ID" align="center" prop="fParentId" />
+      <el-table-column label="费用协议类别名称" align="center" prop="fName" />
+      <el-table-column label="备注" align="center" prop="fRemark" />
+      <el-table-column label="创建人ID" align="center" prop="fCreateBy" />
+      <el-table-column label="创建日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人ID" align="center" prop="fUpdateBy" />
+      <el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['feeagreement:feeagreementtype:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['feeagreement:feeagreementtype:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用协议类型对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父ID" prop="fParentId">
+          <el-input v-model="form.fParentId" placeholder="请输入父ID" />
+        </el-form-item>
+        <el-form-item label="费用协议类别名称" prop="fName">
+          <el-input v-model="form.fName" placeholder="请输入费用协议类别名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
+          <el-input v-model="form.fRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="fCreateBy">
+          <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="创建日期" prop="fCreateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fCreateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新人ID" prop="fUpdateBy">
+          <el-input v-model="form.fUpdateBy" placeholder="请输入更新人ID" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="fUpdateTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.fUpdateTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除状态" prop="fDelFlag">
+          <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFeeagreementtype, getFeeagreementtype, delFeeagreementtype, addFeeagreementtype, updateFeeagreementtype, exportFeeagreementtype } from "@/api/feeagreement/feeagreementtype";
+
+export default {
+  name: "Feeagreementtype",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用协议类型表格数据
+      feeagreementtypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fParentId: null,
+        fName: null,
+        fRemark: null,
+        fCreateBy: null,
+        fCreateTime: null,
+        fUpdateBy: null,
+        fUpdateTime: null,
+        fDelFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询费用协议类型列表 */
+    getList() {
+      this.loading = true;
+      listFeeagreementtype(this.queryParams).then(response => {
+        this.feeagreementtypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fParentId: null,
+        fName: null,
+        fRemark: null,
+        fCreateBy: null,
+        fCreateTime: null,
+        fUpdateBy: null,
+        fUpdateTime: null,
+        fDelFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用协议类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fId = row.fId || this.ids
+      getFeeagreementtype(fId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用协议类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fId != null) {
+            updateFeeagreementtype(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFeeagreementtype(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids;
+      this.$confirm('是否确认删除费用协议类型编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delFeeagreementtype(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有费用协议类型数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportFeeagreementtype(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>