主表新增4个字段

src/views/feeagreement/WarehouseFeeAgreementType/index.vue

@@ -78,6 +78,36 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否有效" prop="fIsValid">
+        <el-select v-model="queryParams.fIsValid" placeholder="请选择是否有效" clearable size="small">
+          <el-option
+            v-for="dict in fIsValidOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否提交" prop="fIsCommit">
+        <el-select v-model="queryParams.fIsCommit" placeholder="请选择是否提交" clearable size="small">
+          <el-option
+            v-for="dict in fIsCommitOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否标准" prop="fIsStandard">
+        <el-select v-model="queryParams.fIsStandard" placeholder="请选择是否标准" clearable size="small">
+          <el-option
+            v-for="dict in fIsStandardOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </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>
@@ -129,6 +159,7 @@
     <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="fName" />
       <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">
@@ -155,6 +186,9 @@
         </template>
       </el-table-column>
       <el-table-column label="删除状态" align="center" prop="fDelFlag" />
+      <el-table-column label="是否有效" align="center" prop="fIsValid" :formatter="fIsValidFormat" />
+      <el-table-column label="是否提交" align="center" prop="fIsCommit" :formatter="fIsCommitFormat" />
+      <el-table-column label="是否标准" align="center" prop="fIsStandard" :formatter="fIsStandardFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -186,6 +220,9 @@
     <!-- 添加或修改费用协议主表对话框 -->
     <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="fName">
+          <el-input v-model="form.fName" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
         <el-form-item label="客户名称" prop="fCorpId">
           <el-input v-model="form.fCorpId" placeholder="请输入客户名称" />
         </el-form-item>
@@ -236,6 +273,36 @@
         <el-form-item label="删除状态" prop="fDelFlag">
           <el-input v-model="form.fDelFlag" placeholder="请输入删除状态" />
         </el-form-item>
+        <el-form-item label="是否有效" prop="fIsValid">
+          <el-select v-model="form.fIsValid" placeholder="请选择是否有效">
+            <el-option
+              v-for="dict in fIsValidOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否提交" prop="fIsCommit">
+          <el-select v-model="form.fIsCommit" placeholder="请选择是否提交">
+            <el-option
+              v-for="dict in fIsCommitOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否标准" prop="fIsStandard">
+          <el-select v-model="form.fIsStandard" placeholder="请选择是否标准">
+            <el-option
+              v-for="dict in fIsStandardOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -272,10 +339,17 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否有效字典
+      fIsValidOptions: [],
+      // 是否提交字典
+      fIsCommitOptions: [],
+      // 是否标准字典
+      fIsStandardOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        fName: null,
         fCorpId: null,
         fTFeeAgreementTypeFId: null,
         fBegindate: null,
@@ -285,7 +359,10 @@ export default {
         fCreateTime: null,
         fUpdateBy: null,
         fUpdateTime: null,
-        fDelFlag: null
+        fDelFlag: null,
+        fIsValid: null,
+        fIsCommit: null,
+        fIsStandard: null
       },
       // 表单参数
       form: {},
@@ -299,6 +376,15 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("sys_yes_no").then(response => {
+      this.fIsValidOptions = response.data;
+    });
+    this.getDicts("sys_yes_no").then(response => {
+      this.fIsCommitOptions = response.data;
+    });
+    this.getDicts("sys_yes_no").then(response => {
+      this.fIsStandardOptions = response.data;
+    });
   },
   methods: {
     /** 查询费用协议主表列表 */
@@ -310,6 +396,18 @@ export default {
         this.loading = false;
       });
     },
+    // 是否有效字典翻译
+    fIsValidFormat(row, column) {
+      return this.selectDictLabel(this.fIsValidOptions, row.fIsValid);
+    },
+    // 是否提交字典翻译
+    fIsCommitFormat(row, column) {
+      return this.selectDictLabel(this.fIsCommitOptions, row.fIsCommit);
+    },
+    // 是否标准字典翻译
+    fIsStandardFormat(row, column) {
+      return this.selectDictLabel(this.fIsStandardOptions, row.fIsStandard);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -319,6 +417,7 @@ export default {
     reset() {
       this.form = {
         fId: null,
+        fName: null,
         fCorpId: null,
         fTFeeAgreementTypeFId: null,
         fBegindate: null,
@@ -328,7 +427,10 @@ export default {
         fCreateTime: null,
         fUpdateBy: null,
         fUpdateTime: null,
-        fDelFlag: null
+        fDelFlag: null,
+        fIsValid: null,
+        fIsCommit: null,
+        fIsStandard: null
       };
       this.resetForm("form");
     },