从从表新增2个字段

src/views/feeagreement/WarehouseFeeAgreementTypeBusinessDetail/index.vue

@@ -106,10 +106,10 @@
       </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="选择更新时间">
+                        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">
@@ -123,12 +123,30 @@
       </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="选择创建日期">
+                        v-model="queryParams.fCreateTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择创建日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="费率" prop="fRate">
+        <el-input
+          v-model="queryParams.fRate"
+          placeholder="请输入费率"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="最大金额" prop="fMaxAmount">
+        <el-input
+          v-model="queryParams.fMaxAmount"
+          placeholder="请输入最大金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建人ID" prop="fCreateBy">
         <el-input
           v-model="queryParams.fCreateBy"
@@ -183,7 +201,7 @@
           v-hasPermi="['feeagreement:WarehouseFeeAgreementTypeBusinessDetail:export']"
         >导出</el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="WarehouseFeeAgreementTypeBusinessDetailList" @selection-change="handleSelectionChange">
@@ -211,6 +229,8 @@
           <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="费率" align="center" prop="fRate" />
+      <el-table-column label="最大金额" align="center" prop="fMaxAmount" />
       <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">
@@ -232,7 +252,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -307,10 +327,10 @@
         </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="选择更新时间">
+                          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">
@@ -318,12 +338,18 @@
         </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="选择创建日期">
+                          v-model="form.fCreateTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择创建日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="费率" prop="fRate">
+          <el-input v-model="form.fRate" placeholder="请输入费率" />
+        </el-form-item>
+        <el-form-item label="最大金额" prop="fMaxAmount">
+          <el-input v-model="form.fMaxAmount" placeholder="请输入最大金额" />
+        </el-form-item>
         <el-form-item label="创建人ID" prop="fCreateBy">
           <el-input v-model="form.fCreateBy" placeholder="请输入创建人ID" />
         </el-form-item>
@@ -340,196 +366,200 @@
 </template>
 
 <script>
-import { listWarehouseFeeAgreementTypeBusinessDetail, getWarehouseFeeAgreementTypeBusinessDetail, delWarehouseFeeAgreementTypeBusinessDetail, addWarehouseFeeAgreementTypeBusinessDetail, updateWarehouseFeeAgreementTypeBusinessDetail, exportWarehouseFeeAgreementTypeBusinessDetail } from "@/api/feeagreement/WarehouseFeeAgreementTypeBusinessDetail";
+  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);
+  export default {
+    name: "WarehouseFeeAgreementTypeBusinessDetail",
+    components: {
     },
-    // 币种字典翻译
-    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
+    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,
+          fRate: null,
+          fMaxAmount: null,
+          fCreateBy: null,
+          fRemark: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          fWarehouseFeeAgreementTypeFId: [
+            { required: true, message: "主表id不能为空", trigger: "blur" }
+          ],
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       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 = "修改费用协议从从表";
+      this.getDicts("fee_agreement_unit").then(response => {
+        this.fFeeUnitIdOptions = response.data;
       });
-    },
-    /** 提交按钮 */
-    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();
-            });
-          }
-        }
+      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;
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const fIds = row.fId || this.ids;
-      this.$confirm('是否确认删除费用协议从从表编号为"' + fIds + '"的数据项?', "警告", {
+    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,
+          fRate: null,
+          fMaxAmount: 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"
@@ -539,11 +569,11 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有费用协议从从表数据项?', "警告", {
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有费用协议从从表数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -552,7 +582,7 @@ export default {
         }).then(response => {
           this.download(response.msg);
         })
+      }
     }
-  }
-};
+  };
 </script>