渠道查询搜索，表格头部内容修改。

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -755,6 +755,7 @@ export default {
       this.$api.expense
         .getAccount(obj)
         .then((res) => {
+          console.log(res)
           res.data.records.forEach((element) => {
             element.outerFlagName =
               element.outerFlag == 0 ? "内部账户" : "外部账户";
@@ -779,6 +780,9 @@ export default {
     },
     //用户性质转换
     dictFn(obj, type) {
+      if(obj.accountQuality==null){
+        return
+      }
       if (type == 1) {
         return this.account_qualityData.find(
           (item) => item.value == obj.accountQuality

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -9,38 +9,28 @@
         label-width="95px"
         class="form"
       >
-        <el-form-item label="开票员" label-width="95px" prop="revenueOutlay">
+        <el-form-item label="开票类型" label-width="95px" prop="">
           <el-select
             v-model="pageRequest.teamOrUserFlag"
-            placeholder="请选择团队或用户查询"
+            placeholder="请选择开票类型"
           >
-            <el-option label="团队" value="1"></el-option>
-            <el-option label="用户" value="2"></el-option>
+            <el-option label="纸质" value="1"></el-option>
+            <el-option label="电子" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          v-show="pageRequest.teamOrUserFlag == 1"
-          label="部门名称"
-          label-width="95px"
-          prop="deptName"
-        >
+        <el-form-item label="开票员" label-width="95px" prop="revenueOutlay">
           <el-input
             v-model="pageRequest.deptName"
-            placeholder="请输入部门名称"
-            class="widths"
+            placeholder="请输入开票方"
+            class=""
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item
-          v-show="pageRequest.teamOrUserFlag == 2"
-          label="用户名称"
-          label-width="95px"
-          prop="applySector"
-        >
+        <el-form-item label="开票方" label-width="95px" prop="deptName">
           <el-input
-            v-model="pageRequest.userName"
-            placeholder="请输入用户名称"
-            class="widths"
+            v-model="pageRequest.deptName"
+            placeholder="请输入开票方"
+            class=""
             clearable
           ></el-input>
         </el-form-item>
@@ -49,16 +39,23 @@
             v-model="pageRequest.date"
             type="date"
             placeholder="选择开票日期"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="queryStaffInfo"
+        <el-form-item
+          ><el-button type="primary" size="small" @click="queryStaffInfo"
             >查询</el-button
           >
         </el-form-item>
       </el-form>
     </el-row>
+    <el-button
+      class="operation"
+      type="primary"
+      plain
+      size="medium"
+      @click="addPayment"
+      >开票新增</el-button
+    >
     <!-- 表格 -->
     <kt-common-table
       v-loading="loading"
@@ -71,12 +68,13 @@
       :data="pageResult"
       :columns="columns"
       :showBatchDelete="false"
-      :showOperation="showOperation"
-      editButtonName="详情"
+      :showOperation="true"
+      editButtonName="编辑"
       @findPage="findPage"
       :isshowpagination="true"
       @handleEdit="handleDetail"
     ></kt-common-table>
+    <!-- 新增编辑弹框 -->
     <el-dialog
       class="dialog detailtTable"
       :title="title"
@@ -84,6 +82,371 @@
       :before-close="resetForm"
       :visible.sync="detailDialog"
       width="60%"
+    >
+      <div class="dialog-body">
+        <el-form
+          :model="formData"
+          :rules="rules"
+          ref="formData"
+          label-width="130px"
+          size="small"
+          class="frame"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="账户类别" prop="outerFlag">
+                <el-select
+                  v-model="formData.outerFlag"
+                  placeholder="请选择账户类别"
+                >
+                  <el-option label="内部账户" value="0"></el-option>
+                  <el-option label="外部账户" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="户名" prop="accountName">
+                <el-input
+                  v-model="formData.accountName"
+                  autocomplete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="账户性质" prop="accountQuality">
+                <el-select
+                  v-model="formData.accountQuality"
+                  placeholder="请选择账户性质"
+                >
+                  <!-- <el-option
+                    v-for="item in dictionariesData"
+                    :key="item.value + 'bb'"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option> -->
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="银行卡号" prop="bankCardNum">
+                <el-input
+                  v-model="formData.bankCardNum"
+                  autocomplete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="营业性质" prop="yyxz">
+                <el-select v-model="formData.yyxz" placeholder="请选择营业性质">
+                  <el-option label="一般纳税" value="0"></el-option>
+                  <el-option label="小规模" value="1"></el-option>
+                  <el-option label="个体户" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属地" prop="ssd">
+                <el-input v-model="formData.ssd" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="法人" prop="fr">
+                <el-input v-model="formData.fr" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="成立日期" prop="clrq">
+                <el-date-picker
+                  v-model="formData.clrq"
+                  type="date"
+                  placeholder="选择日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="开户行" prop="bank">
+                <el-input v-model="formData.bank" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="formData.outerFlag == 0" :span="12">
+              <el-form-item label="开户行名称" prop="bankName">
+                <el-input
+                  v-model="formData.bankName"
+                  autocomplete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="开户行号" prop="bankNum">
+                <el-input
+                  v-model="formData.bankNum"
+                  autocomplete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="证书有效期" prop="certExpirationDate">
+                <el-date-picker
+                  v-model="formData.certExpirationDate"
+                  size="small"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  @change="setDateInterval($event)"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="结算卡" prop="clearingProfit">
+                <el-input-number
+                  v-model="formData.clearingProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="单日转账笔数限制" prop="dayStrokeNum">
+                <el-input-number
+                  v-model="formData.dayStrokeNum"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="外部过账金额" prop="exteriorProfit">
+                <el-input-number
+                  v-model="formData.exteriorProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="财税公司利润" prop="fiscalProfit">
+                <el-input-number
+                  v-model="formData.fiscalProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="保险公司回款" prop="insuranceProfit">
+                <el-input-number
+                  v-model="formData.insuranceProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="其他利润" prop="otherProfit">
+                <el-input-number
+                  v-model="formData.otherProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="园区利润" prop="parkProfit">
+                <el-input-number
+                  v-model="formData.parkProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对私单日限额" prop="priDayLines">
+                <el-input-number
+                  v-model="formData.priDayLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="对私单笔限额" prop="priSingleLines">
+                <el-input-number
+                  v-model="formData.priSingleLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对私年额度" prop="priYearLines">
+                <el-input-number
+                  v-model="formData.priYearLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="对公单日限额" prop="pubDayLines">
+                <el-input-number
+                  v-model="formData.pubDayLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对公单笔限额" prop="pubSingleLines">
+                <el-input-number
+                  v-model="formData.pubSingleLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="对公年额度" prop="pubYearLines">
+                <el-input-number
+                  v-model="formData.pubYearLines"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="天勤利润" prop="tianqinProfit">
+                <el-input-number
+                  v-model="formData.tianqinProfit"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="单日转账笔数剩余" prop="dayStrokeNumExcess">
+                <el-input-number
+                  v-model="formData.dayStrokeNumExcess"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对私单日限额剩余" prop="priDayLinesExcess">
+                <el-input-number
+                  v-model="formData.priDayLinesExcess"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="对私年剩余额度" prop="priYearExcess">
+                <el-input-number
+                  v-model="formData.priYearExcess"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="对公单日限额剩余" prop="pubDayLinesExcess">
+                <el-input-number
+                  v-model="formData.pubDayLinesExcess"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="对公年剩余额度" prop="pubYearExcess">
+                <el-input-number
+                  v-model="formData.pubYearExcess"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="支出金额" prop="spend">
+                <el-input-number
+                  v-model="formData.spend"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm" size="small">取 消</el-button>
+        <el-button @click="submitInfo" type="primary" size="small">{{
+          modelText
+        }}</el-button>
+      </div>
+    </el-dialog>
+    <!-- <el-dialog
+      class="dialog detailtTable"
+      :title="title"
+      :close-on-click-modal="false"
+      :before-close="resetForm"
+      :visible.sync="detailDialog"
+      width="60%"
     >
       <div class="dialog-body">
         <el-table
@@ -131,7 +494,7 @@
         </div>
         <el-button @click="resetForm" size="small">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
         <script>
@@ -146,10 +509,9 @@ export default {
   mounted() {},
   data() {
     return {
-      title: "详情",
+      title: "开票新增",
       loading: true,
       detailDialog: false,
-      showOperation: true,
       operationWidth: 100, //操作列宽度
       queryFrom: {
         //查询条件
@@ -267,9 +629,84 @@ export default {
           minWidth: "120",
         },
       ],
+      modelText: "提 交",
+      formData: {
+        outerFlag: "0", //账户类别
+        accountName: "", //户名
+        accountQuality: "", //账户性质
+        bankCardNum: "", //银行卡号
+        bank: "", //开户行
+        bankName: "", //开户行名称
+        bankNum: "", //开户行号
+        certExpirationDate: "", //证书有效期
+        clearingProfit: "", //结算卡
+        dayStrokeNum: "", //单日转账笔数限制
+        exteriorProfit: "", //外部过账金额
+        fiscalProfit: "", //财税公司利润
+        insuranceProfit: "", //保险公司回款
+        otherProfit: "", //其他利润
+        parkProfit: "", //园区利润
+        priDayLines: "", //对私单日限额
+        priSingleLines: "", //对私单笔限额
+        priYearExcess: "", //对私年剩余额度
+        priYearLines: "", //对私年额度
+        pubDayLines: "", //对公单日限额
+        pubSingleLines: "", //对公单笔限额
+        pubYearExcess: "", //对公年剩余额度
+        pubYearLines: "", //对公年额度
+        tianqinProfit: "", //天勤利润
+        dayStrokeNumExcess: "", //单日转账笔数剩余
+        priDayLinesExcess: "", //对私单日限额剩余
+        pubDayLinesExcess: "", //对公单日限额剩余
+        spend: "", //	支出金额
+        yyxz: "", //营业性质
+        ssd: "", //所属地
+        fr: "", //法人
+        clrq: "", //成立日期
+      },
+      rules:{
+        //内部表单规则
+        outerFlag: [
+          { required: true, message: "请选择账户类别", trigger: "change" },
+        ],
+        accountName: [
+          { required: true, message: "户名不能为空", trigger: "blur" },
+        ],
+        accountQuality: [
+          { required: true, message: "请选择账户性质", trigger: "change" },
+        ],
+        bankCardNum: [
+          { required: true, message: "银行卡号不能为空", trigger: "blur" },
+        ],
+        bank: [{ required: true, message: "开户行不能为空", trigger: "blur" }],
+        bankName: [
+          { required: true, message: "开户行名称不能为空", trigger: "blur" },
+        ],
+        bankNum: [
+          { required: true, message: "开户行号不能为空", trigger: "blur" },
+        ],
+        // clearingProfit: [
+        //   { required: true, message: "结算卡不能为空", trigger: "blur" },
+        // ],
+        certExpirationDate: [
+          {
+            required: true,
+            message: "请选择证书有效期",
+            trigger: "change",
+          },
+        ],
+      },
     };
   },
   methods: {
+    //新增开票
+    addPayment() {
+      this.detailDialog = true;
+    },
+    //新增编辑开票信息
+    submitInfo() {
+      console.log(123);
+    },
     //选择时间区间
     dateChange(e) {
       if (e == null) {
@@ -296,7 +733,7 @@ export default {
       this.detailParams.pageNo = 1;
       this.detailParams.pageSize = 10;
     },
-    //查看详情
+    //编辑按钮
     handleDetail(index) {
       let row = index.row;
       this.detailParams.deptId = row.deptId;
@@ -348,23 +785,6 @@ export default {
     },
     // 查询
     queryStaffInfo() {
-      if (this.pageRequest.teamOrUserFlag == 1) {
-        this.$set(this.columns, 0, {
-          prop: "deptName",
-          label: "部门名称",
-          type: "text",
-        });
-        this.showOperation = true;
-        this.pageRequest.userName = "";
-      } else {
-        this.$set(this.columns, 0, {
-          prop: "userName",
-          label: "成员名称",
-          type: "text",
-        });
-        this.pageRequest.deptName = "";
-        this.showOperation = false;
-      }
       this.pageRequest.pageNo = 1;
       this.pageRequest.pageSize = 10;
       this.findPage();
@@ -435,6 +855,7 @@ export default {
 }
 /deep/ .el-dialog__body {
   height: 550px;
+  overflow-y: auto;
 }
 .addremove-box {
   width: 100%;

src/views/PeopleManage/Seo/ChannelSearch.vue

@@ -4,32 +4,22 @@
         <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
           <el-row>
             <el-col :span="5">
-              <el-form-item label="工号">
+              <el-form-item label="机构名称">
                 <el-input
                   clearable
                   size="small"
-                  placeholder="工号"
-                  v-model="queryFrom.userId"
+                  placeholder="机构名称"
+                  v-model="queryFrom.deptName"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item label="姓名">
+              <el-form-item label="部门编码">
                 <el-input
                   clearable
                   size="small"
-                  placeholder="姓名"
-                  v-model="queryFrom.name"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="手机号">
-                <el-input
-                  clearable
-                  size="small"
-                  placeholder="手机号"
-                  v-model="queryFrom.mobile"
+                  placeholder="部门编码"
+                  v-model="queryFrom.deptId"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -78,66 +68,24 @@
         <el-table-column
           header-align="center"
           align="center"
-          prop="id"
-          label="工号"
-        >
-        </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="name"
-          label="姓名"
-        >
-        </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="sex"
-          label="性别"
-        >
-        </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="mobile"
-          label="电话"
-        >
-        </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="teamnum"
-          label="我的团队"
+          prop="address"
+          label="地址"
         >
         </el-table-column>
         <el-table-column
           header-align="center"
           align="center"
-          prop="level1num"
-          label="一级团队(人数)"
+          prop="count"
+          label="人数"
         >
         </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="level2num"
-          label="二级团队(人数)"
-        >
-        </el-table-column>
-        <el-table-column
-          header-align="center"
-          align="center"
-          prop="tempnum"
-          label="临时用户(人数)"
-        >
-        </el-table-column>
-        <el-table-column header-align="center" align="center" label="操作">
-          <!-- <template slot-scope="scope">
+        <!-- <el-table-column header-align="center" align="center" label="操作">
+          <template slot-scope="scope">
             <el-button type="text" size="small" @click="handleTableEdit(scope)"
               >查看</el-button
             >
-          </template> -->
-        </el-table-column>
+          </template>
+        </el-table-column> -->
       </el-table>
       <div class="bottomFixed" style="padding-bottom: 50px;margin-top:30px" ref="bottomFixed">
         <el-pagination