收费页面提交

src/api/finance/charge.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询财务数据主列表
+export function listCharge(query) {
+  return request({
+    url: '/finance/charge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询财务数据主详细
+export function getCharge(fId) {
+  return request({
+    url: '/finance/charge/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增财务数据主
+export function addCharge(data) {
+  return request({
+    url: '/finance/charge/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改财务数据主
+export function updateCharge(data) {
+  return request({
+    url: '/finance/charge',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除财务数据主
+export function delCharge(fId) {
+  return request({
+    url: '/finance/charge/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出财务数据主
+export function exportCharge(query) {
+  return request({
+    url: '/finance/charge/export',
+    method: 'get',
+    params: query
+  })
+}
+// 导入搜索
+export function search(queryParameter) {
+  return request({
+    url: '/finance/charge/chargeList',
+    method: 'get',
+    params: queryParameter
+  })
+}
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/customerDetails/corps/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/agreement/agreementTask/index.vue

@@ -641,14 +641,16 @@ export default {
     },
     // 远程模糊查询费用名称
     fWRemoteMethod(name) {
+      this.fWbuOptions = []
       if (name == null || name === "") {
         return false;
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name };
       listFees(queryParams).then((response) => {
-        let fWbuOptions = this.fWbuOptions.concat(response.rows)
-        this.fWbuOptions = Array.from(new Set(fWbuOptions))
-        console.log(this.fWbuOptions)
+        this.fWbuOptions = response.rows
+
+        // let fWbuOptions = this.fWbuOptions.concat(response.rows)
+        // this.fWbuOptions = Array.from(new Set(fWbuOptions))
       });
     },
     // 作业费状态修改

src/views/finance/charge/index.vue

@@ -0,0 +1,715 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams_s" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-input
+          v-model="queryParams_s.fCtrlcorpid"
+          placeholder="请输入货权方"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结算单位" prop="fCorpid">
+        <el-select v-model="queryParams_s.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)" clearable size="small">
+          <el-option label="请选择字典生成" value=""/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="对账日期" prop="fAccbilldate">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams_s.fAccbilldate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择账单日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="状态" prop="fBillno">
+        <el-input
+          v-model="queryParams_s.fBillno"
+          placeholder="请输入选择状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="系统编号" prop="fBillno">
+        <el-input
+          v-model="queryParams_s.fBillno"
+          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="['finance:charge: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="['finance:charge: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="['finance:charge:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['finance:charge:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="序1号" type="index" width="55" align="center"/>
+      <el-table-column label="系统编号" align="center" prop="fBillno"/>
+      <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
+      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="制单部门" align="center" prop="fId"/>
+      <el-table-column label="结算单位" align="center" prop="fCorpid"/>
+      <el-table-column label="提单号" align="center" prop="tMblno"/>
+      <el-table-column label="应收合计" align="center" prop="fAmtdr"/>
+      <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
+      <el-table-column label="单据类型" align="center" prop="fBilltype"/>
+      <el-table-column label="状态" align="center" prop="fBillstatus"/>
+      <el-table-column label="备注" align="center" prop="fRemarks"/>
+      <el-table-column label="制单部门" align="center" prop="fDeptid"/>
+      <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="['finance:charge:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['finance:charge: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 :close-on-click-modal="false" :title="title" :visible.sync="open" width="65%" append-to-body>
+      <el-form :model="queryParams" :rules="ruless" ref="ruless" :inline="true" v-show="showSearch"
+               label-width="68px"
+      >
+        <el-form-item label="货权方" prop="fCtrlcorpid">
+          <el-input
+            v-model="queryParams.fCtrlcorpid"
+            placeholder="请输入货权方"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="结算单位" prop="fCorpid">
+          <el-select
+            v-model="queryParams.fCorpid"
+            filterable
+            remote
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+            :remote-method="corpsRemoteMethod"
+            placeholder="请输入结算单位"
+          >
+            <el-option
+              v-for="(dict, index) in fMblnoOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="对账日期" prop="fAccbilldate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="queryParams.fAccbilldate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择账单日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="系统编号" prop="fBillno">
+          <el-input
+            v-model="queryParams.fBillno"
+            placeholder="请输入系统编号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemarks">
+          <el-input
+            v-model="queryParams.fRemarks"
+            placeholder="请输入备注"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      </el-form>
+      <div style="width: 100%;">
+        <el-button type="primary" size="small" @click="innerVisible = true">确认收费</el-button>
+        <el-button type="success" size="small">导出</el-button>
+        <el-button type="info" size="small">打印</el-button>
+        <el-button type="danger" size="small">删除</el-button>
+      </div>
+      <el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="序号" type="index" width="55" align="center"/>
+        <el-table-column label="提单号" align="center" prop="fMblno"/>
+        <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
+        <el-table-column label="品名" align="center" prop="fProductName"/>
+        <el-table-column label="业务日期" align="center" prop="fBsdate"/>
+        <el-table-column label="费用名称" align="center" prop="fFeeName"/>
+        <el-table-column label="收/付" align="center" prop="fDc">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fDc =='D'">收</span>
+            <span v-else="scope.row.fDc =='C'">付</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务类型" align="center" prop="fBilltype">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fBilltype =='SJRK'">入库</span>
+            <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
+            <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
+            <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="本次金额" align="center" prop="fAmt"/>
+        <el-table-column label="备注" align="center" prop="fRemarks"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+      <el-dialog :close-on-click-modal="false" width="65%" :visible.sync="innerVisible" title="导入数据" append-to-body>
+        <el-form ref="form" :model="queryParameter" :rules="rules" label-width="80px"
+                 style="display: flex;flex-wrap: wrap;"
+        >
+          <el-form-item label="货权方" prop="fCtrlcorpid">
+<!--            <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
+            <el-select
+              v-model="queryParams.fCorpid"
+              filterable
+              remote
+              clearable
+              style="width: 200px"
+              @keyup.enter.native="handleQuery"
+              :remote-method="corpsRemoteMethod"
+              placeholder="请输入结算单位"
+            >
+              <el-option
+                v-for="(dict, index) in fMblnoOptions"
+                :key="index.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="结算单位" prop="fToCorpid">
+            <el-select
+              v-model="queryParameter.fToCorpid"
+              filterable
+              remote
+              clearable
+              style="width: 200px"
+              @keyup.enter.native="handleQuery"
+              :remote-method="corpsRemoteMethod"
+              placeholder="请输入结算单位"
+            >
+              <el-option
+                v-for="(dict, index) in fMblnoOptions"
+                :key="index.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提单号" prop="tMblno">
+            <el-input v-model="queryParameter.fMblno" placeholder="请输入提单号" style="width: 200px;"/>
+          </el-form-item>
+          <el-form-item label="对账单号" prop="fStatementNo">
+            <el-input v-model="queryParameter.fStatementNo" placeholder="请输入提单号" style="width: 200px;"/>
+          </el-form-item>
+          <el-form-item label="费用名称" prop="fFeeid">
+            <template>
+              <el-select
+                v-model="queryParameter.fFeeid"
+                filterable
+                remote
+                :disabled="browseStatus"
+                :remote-method="fWRemoteMethod"
+                placeholder="费用名称"
+                multiple
+              >
+                <el-option v-for="item in fWbuOptions" :key="item.fId" :label="item.fName" :value="item.fId">
+                </el-option>
+              </el-select>
+            </template>
+          </el-form-item>
+          <el-form-item label="审核日期" prop="timeExamine">
+            <el-date-picker
+              size="small"
+              style="width: 200px"
+              v-model="queryParameter.timeExamine"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="出入库日期" label-width="85px" prop="fAccbilldate">
+            <el-date-picker
+              size="small"
+              style="width: 200px"
+              v-model="queryParameter.timeInterval"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="importSearch">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s">重1置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="chargeList_s" @selection-change="handleSelectionChange_s">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="序号" type="index" width="55" align="center"/>
+          <el-table-column label="货权方" align="center" prop="fName"/>
+          <el-table-column label="提单号" align="center" prop="fMblno"/>
+          <el-table-column label="品名" align="center" prop="fProductName"/>
+          <el-table-column label="业务日期" align="center" prop="fBsdate"/>
+          <el-table-column label="业务类型" align="center" prop="fBilltype">
+            <template slot-scope="scope">
+              <span v-if="scope.row.fBilltype =='SJRK'">入库</span>
+
+              <span v-else="scope.row.fBilltype == 'SJCK'">出库</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核日期" align="center" prop="fReviewDate"/>
+          <el-table-column label="费用名称" align="center" prop="fFeeName"/>
+          <el-table-column label="金额" align="center" prop="fAmtdr"/>
+          <el-table-column label="本次金额" align="center" prop="fAmt">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fNewAmount"
+                placeholder="请输入本次金额"
+                clearable
+                size="small"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="fRemarks">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fRemarks"
+                placeholder="请输入备注"
+                clearable
+                size="small"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirmImport">确 定</el-button>
+          <el-button @click="innerVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCharge,
+  getCharge,
+  delCharge,
+  addCharge,
+  updateCharge,
+  exportCharge,
+  search,
+  listCorps
+} from '@/api/finance/charge'
+import { listFees } from '@/api/basicdata/fees'
+
+export default {
+  name: 'Charge',
+  components: {},
+  data() {
+    return {
+      browseStatus: false,
+      fWbuOptions: [],
+      // 遮罩层
+      loading: true,
+      //打开内部弹窗
+      innerVisible: false,
+      chargeList_s: [],
+      selection: '',
+      increase_s: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 财务数据主表格数据
+      chargeList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      fMblnoOptions: '',
+      //导入查询参数
+      queryParameter: {
+        fCorpid: '',
+        fToCorpid: '',
+        fMblno: '',
+        fStatementNo: '',
+        fFeeid: '',
+        timeExamine: '',
+        timeInterval: ''
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: null,
+        fRemarks: null,
+        fAccbilldate: null,
+        fDeptid: null
+      },
+      // 主表查询参数
+      queryParams_s: {
+        pageNum: 1,
+        pageSize: 10,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: null,
+        fRemarks: null,
+        fAccbilldate: null,
+        fDeptid: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      ruless: {
+        fCtrlcorpid: [
+          { required: true, message: '货权方不能为空', trigger: 'blur' }
+        ],
+        fCorpid: [
+          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+        ],
+        fAccbilldate: [
+          { required: true, message: '对账日期不能为空', trigger: 'blur' }
+        ]
+      },
+      // 表单校验
+      rules: {
+        fBilltype: [
+          { required: true, message: '单据类型', trigger: 'change' }
+        ],
+        fBillstatus: [
+          { required: true, message: '状态不能为空', trigger: 'blur' }
+        ],
+        fDeptid: [
+          { required: true, message: '制单部门不能为空', trigger: 'blur' }
+        ],
+        fToCorpid: [
+          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+        ],
+        timeExamine: [
+          { required: true, message: '审核日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    //确认导入
+    confirmImport() {
+      if (this.selection.length == '0') {
+        console.log('未选择')//写入提示
+      } else {
+        this.increase_s = this.selection
+        this.innerVisible = false
+        this.chargeList_s = []
+        this.queryParameter = {
+          fCorpid: '',
+          fToCorpid: '',
+          fMblno: '',
+          fStatementNo: '',
+          fFeeid: '',
+          timeExamine: '',
+          timeInterval: ''
+        }
+      }
+    },
+    /** 查询财务数据主列表 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams_s)
+      listCharge(this.queryParams_s).then(response => {
+        console.log(response)
+        this.chargeList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fId: null,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: '0',
+        fRemarks: null,
+        fAccbilldate: null,
+        delFlag: null,
+        createBy: null,
+        fDeptid: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 导入搜索 */
+    importSearch() {
+      console.log(this.queryParameter.fFeeid)
+      // console.log(this.queryParameter.fFeeid.join(','))
+      // .join(',')
+      this.chargeList_s = []
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          console.log(this.queryParameter)
+          search(this.queryParameter).then(response => {
+            this.chargeList_s = response.rows
+            console.log(response)
+          })
+        }
+      })
+    },
+    /** 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 }
+      listCorps(queryParams).then((response) => {
+        this.fMblnoOptions = response.rows
+        this.KHblnoOptions = response.rows
+      })
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryParams_s')
+      this.handleQuery()
+    },
+    //导入重置按钮
+    resetQuery_s() {
+      this.queryParameter = {
+        fCorpid: '',
+        fToCorpid: '',
+        fMblno: '',
+        fStatementNo: '',
+        fFeeid: '',
+        timeExamine: '',
+        timeInterval: ''
+      }
+    },
+    // 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      this.fWbuOptions = []
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name }
+      listFees(queryParams).then((response) => {
+        console.log(this.fWbuOptions)
+        this.fWbuOptions = response.rows
+      })
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    // 导入多选框
+    handleSelectionChange_s(selection) {
+      this.selection = selection
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加财务数据主'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const fId = row.fId || this.ids
+      getCharge(fId).then(response => {
+        console.log(response)
+        this.increase_s = response.data.tFeeDoList
+        this.queryParams = response.data.tFee
+        this.fWbuOptions = response.data.feesList
+        this.open = true
+        this.title = '修改财务数据主'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['ruless'].validate(valid => {
+        console.log(valid)
+        if (valid) {
+          if (this.form.fId != null) {
+            updateCharge(this.form).then(response => {
+              this.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            let formData = new window.FormData()
+            formData.append('tFee', JSON.stringify(this.form))
+            formData.append('tFeeDo', JSON.stringify(this.increase_s))
+
+            addCharge(formData).then(response => {
+              this.msgSuccess('新增成功')
+              this.increase_s = []
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fIds = row.fId || this.ids
+      this.$confirm('是否确认删除财务数据主编号为"' + fIds + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delCharge(fIds)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有财务数据主数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportCharge(queryParams)
+      }).then(response => {
+        this.download(response.msg)
+      })
+    }
+  }
+}
+</script>

src/views/finance/contrast/index.vue

@@ -1,42 +1,52 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="业务编号(唯一格式+YYYY+YY+NNN，
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
-对账 DZ
-
-收费 SF
-
-付费 FF
-
-发票 FP" prop="fBillno">
-        <el-input
-          v-model="queryParams.fBillno"
-          placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
-对账 DZ
-
-收费 SF
-
-付费 FF
-
-发票 FP"
+      <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-select
+          v-model="queryParams.fCtrlcorpid"
+          filterable
+          remote
           clearable
-          size="small"
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="货权方" prop="fCtrlcorpid">
-        <el-select v-model="queryParams.fCtrlcorpid" placeholder="请选择货权方" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          :remote-method="corpsRemoteMethod"
+          placeholder="请输入客户名称"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="结算单位(下拉模糊搜索)" prop="fCorpid">
-        <el-select v-model="queryParams.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+      <el-form-item label="结算单位" prop="fCorpid">
+        <el-select label="请选择字典生成" value=""
+        v-model="queryParams.fCorpid"
+        placeholder="请选择结算单位"
+        clearable size="small"
+        @keyup.enter.native="handleQuery"
+        :remote-method="corpsRemoteMethod">
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="提单号" prop="tMblno">
+
+      <el-form-item label="录入人" prop="createBy">
+        <el-input
+            v-model="form.createBy"
+            :disabled="true"
+            placeholder="默认录入人"
+            clearable
+            size="small"
+          />
+      </el-form-item>
+
+      <!-- <el-form-item label="提单号" prop="tMblno">
         <el-input
           v-model="queryParams.tMblno"
           placeholder="请输入提单号"
@@ -44,8 +54,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="应收合计" prop="fAmtdr">
+      </el-form-item>-->
+      <!-- <el-form-item label="应收合计" prop="fAmtdr">
         <el-input
           v-model="queryParams.fAmtdr"
           placeholder="请输入应收合计"
@@ -53,8 +63,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="应付合计" prop="fAmtcr">
+      </el-form-item> -->
+      <!-- <el-form-item label="应付合计" prop="fAmtcr">
         <el-input
           v-model="queryParams.fAmtcr"
           placeholder="请输入应付合计"
@@ -62,18 +72,35 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
-        <el-select v-model="queryParams.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" clearable size="small">
+      </el-form-item> -->
+      <!-- <el-form-item label="单据类型" prop="fBilltype">
+        <el-select v-model="queryParams.fBilltype" placeholder="请选择单据类型" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="对账日期">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
+
       <el-form-item label="状态" prop="fBillstatus">
-        <el-select v-model="queryParams.fBillstatus" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+        <el-input label="录入已对账" value=""
+        v-model="queryParams.fBillstatus"
+        placeholder="请选择状态"
+        clearable
+        size="small"
+        @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="备注" prop="fRemarks">
+      <!-- <el-form-item label="备注" prop="fRemarks">
         <el-input
           v-model="queryParams.fRemarks"
           placeholder="请输入备注"
@@ -81,20 +108,16 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>-->
+      <el-form-item label="系统编号" prop="fBillno">
+        <el-input placeholder="请输入"
+        v-model="queryParams.fBillno"
+        @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.fAccbilldate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择账单日期(审批流结束后更新)">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="制单部门" prop="fDeptid">
-        <el-select v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
+
+      <!-- <el-form-item label="制单部门" prop="fDeptid">
+        <el-input label="请选择字典生成" value="" v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small"/>
+      </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>
@@ -104,17 +127,15 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          icon="el-icon-plus"
+          type="success"
           size="mini"
-          @click="handleAdd"
+          @click="dialogVisible = true"
           v-hasPermi="['warehouse:fee:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          icon="el-icon-edit"
+          type="warning"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -124,7 +145,6 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
@@ -133,43 +153,43 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          icon="el-icon-download"
+          type="info"
+          size="mini"
+          @click="openImportTable"
+          v-hasPermi="['warehouse:fee:export']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
           size="mini"
           @click="handleExport"
           v-hasPermi="['warehouse:fee: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="feeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="制单部门" align="center" prop="fId" />
-      <el-table-column label="业务编号(唯一格式+YYYY+YY+NNN，
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
-对账 DZ
-
-收费 SF
-
-付费 FF
-
-发票 FP" align="center" prop="fBillno" />
-      <el-table-column label="货权方" align="center" prop="fCtrlcorpid" />
-      <el-table-column label="结算单位(下拉模糊搜索)" align="center" prop="fCorpid" />
-      <el-table-column label="提单号" align="center" prop="tMblno" />
-      <el-table-column label="应收合计" align="center" prop="fAmtdr" />
-      <el-table-column label="应付合计" align="center" prop="fAmtcr" />
-      <el-table-column label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" align="center" prop="fBilltype" />
-      <el-table-column label="状态" align="center" prop="fBillstatus" />
-      <el-table-column label="备注" align="center" prop="fRemarks" />
-      <el-table-column label="账单日期(审批流结束后更新)" align="center" prop="fAccbilldate" width="180">
+    <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
+      <el-table-column label="选择" width="55" align="center"/>
+      <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
+      <el-table-column label="行号" align="center"/>
+      <el-table-column label="系统编号" align="center" prop="fBillno"/>
+      <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
+      <el-table-column label="结算单位" align="center" prop="fCorpid"/>
+      <el-table-column label="账单日期" align="center" prop="fAccbilldate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="制单部门" align="center" prop="fDeptid" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="提单号" align="center" prop="tMblno"/>
+      <el-table-column label="应收合计" align="center" prop="fAmtdr"/>
+      <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
+<!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
+      <el-table-column label="备注" align="center" prop="fRemarks" />
+      <el-table-column label="状态" align="center" prop="fBillstatus" />
+      <!-- <el-table-column label="制单部门" align="center" prop="fDeptid" /> -->
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -186,7 +206,7 @@
             v-hasPermi="['warehouse:fee:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -197,49 +217,242 @@
       @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="业务编号(唯一格式+YYYY+YY+NNN，
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
-对账 DZ
+    <!-- 对账表 -->
+    <el-dialog :visible.sync="dialogVisible" width="65%" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+
+        <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-select
+          v-model="form.fCtrlcorpid"
+          filterable
+          remote
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+          :remote-method="corpsRemoteMethod"
+          placeholder="请输入客户名称"
+        >
+
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="结算单位" prop="fCorpid">
+        <el-select label="请选择字典生成" value=""
+        v-model="form.fCorpid"
+        placeholder="请选择结算单位"
+        clearable size="small"
+        :remote-method="corpsRemoteMethod">
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 
-收费 SF
 
-付费 FF
+      <el-form-item label="提单号" prop="tMblno">
+          <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+
+      <el-form-item label="对账日期">
+        <el-date-picker
+          v-model="value3"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="date">
+        </el-date-picker>
+      </el-form-item>
 
-发票 FP" prop="fBillno">
-          <el-input v-model="form.fBillno" placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
-对账 DZ
+      <el-form-item label="单据日期">
+        <el-date-picker
+          v-model="value4"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="date">
+        </el-date-picker>
+      </el-form-item>
 
-收费 SF
+      <el-form-item label="单据编号">
+        <el-input/>
+      </el-form-item>
 
-付费 FF
+      <el-form-item label="录入人" prop="createBy">
+        <el-input v-model="form.createBy"/>
+      </el-form-item>
 
-发票 FP" />
+      <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          size="mini"
+          @click="handleAdd" v-hasPermi="['warehouse:fee:add']"
+        >确认对账</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+        >打印</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          size="mini"
+          @click="handleDelete"
+          v-hasPermi="['warehouse:fee:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    </el-form>
+
+    <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
+        <el-table-column label="选1择" width="55" align="center"/>
+        <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
+        <el-table-column label="行号" align="center"/>
+        <el-table-column label="提单号" align="center" prop="tMblno"/>
+        <el-table-column label="业务日期" align="center"/>
+        <el-table-column label="费用名称" align="center"/>
+        <el-table-column label="收/付" align="center"/>
+        <el-table-column label="金额" align="center"/>
+        <el-table-column label="业务类型" align="center"/>
+    </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改财务数据主对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+        <el-form-item label="业务编号" prop="fBillno">
+          <el-input v-model="form.fBillno" placeholder="请输入业务编号" />
         </el-form-item>
-        <el-form-item label="货权方" prop="fCtrlcorpid">
-          <el-select v-model="form.fCtrlcorpid" placeholder="请选择货权方">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
+
+        <el-form-item class="el-form-item__label" label="货权方" prop="fCtrlcorpid">
+          <el-input value="" v-model="form.fCtrlcorpid" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="结算单位(下拉模糊搜索)" prop="fCorpid">
-          <el-select v-model="form.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
+        <el-form-item label="结算单位" prop="fCorpid">
+          <el-input value="" v-model="form.fCorpid" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="form.tMblno" placeholder="请输入提单号" />
+          <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="应收合计" prop="fAmtdr">
+        <el-form-item label="收付">
+          <el-col :span="6">
+            <el-input placeholder="收" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="是否对账">
+          <el-col :span="6">
+            <el-input placeholder="否" />
+          </el-col>
+        </el-form-item>
+
+
+
+
+        <el-form-item label="费用名称" prop="fFeeid">
+            <template>
+              <el-select
+                v-model="form.fFeeid"
+                filterable
+                :disabled="browseStatus"
+                remote
+                :remote-method="fWRemoteMethod"
+                placeholder="费用名称"
+              >
+                <el-option
+                  v-for="(dict, index) in fWbuOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </template>
+
+        </el-form-item>
+
+
+
+
+
+
+        <el-form-item label="审核日期">
+        <el-date-picker
+          v-model="value1"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="对账日期">
+        <el-date-picker
+          v-model="value2"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button class="btnColor" type="info" size="mini">导入</el-button>
+        <el-button class="btnColor" type="info" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button class="btnColor" type="info" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+
+      <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
+        <el-table-column label="选2择" width="55" align="center"/>
+        <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
+        <el-table-column label="行号" align="center"/>
+        <el-table-column label="系统编号" align="center" prop="fBillno"/>
+        <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
+        <el-table-column label="结算单位" align="center" prop="fCorpid"/>
+        <el-table-column label="账单日期" align="center" prop="fAccbilldate"/>
+        <el-table-column label="提单号" align="center" prop="tMblno"/>
+        <el-table-column label="应收合计" align="center" prop="fAmtdr"/>
+        <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
+  <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
+        <el-table-column label="备注" align="center" prop="fRemarks" />
+        <el-table-column label="状态" align="center" prop="fBillstatus" />
+      </el-table>
+
+        <!-- <el-form-item label="应收合计" prop="fAmtdr">
           <el-input v-model="form.fAmtdr" placeholder="请输入应收合计" />
         </el-form-item>
         <el-form-item label="应付合计" prop="fAmtcr">
           <el-input v-model="form.fAmtcr" placeholder="请输入应付合计" />
         </el-form-item>
-        <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
-          <el-select v-model="form.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)">
+        <el-form-item label="单据类型" prop="fBilltype">
+          <el-select v-model="form.fBilltype" placeholder="请选择单据类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
@@ -251,12 +464,12 @@
         <el-form-item label="备注" prop="fRemarks">
           <el-input v-model="form.fRemarks" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
+        <el-form-item label="账单日期" prop="fAccbilldate">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.fAccbilldate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择账单日期(审批流结束后更新)">
+                          v-model="form.fAccbilldate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择账单日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="删除状态" prop="delFlag">
@@ -266,27 +479,38 @@
           <el-select v-model="form.fDeptid" placeholder="请选择制单部门">
             <el-option label="请选择字典生成" value="" />
           </el-select>
-        </el-form-item>
+        </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 { listFee, getFee, delFee, addFee, updateFee, exportFee } from "@/api/finance/contrast";
-
+import { listCorps } from '@/api/basicdata/corps'
+import { listFees } from '@/api/basicdata/fees'
+import moment from 'moment'
 export default {
   name: "Fee",
   components: {
   },
   data() {
     return {
+      browseStatus:false,
+      value1:"",
+      value2:"",
+      value3:"",
+      value4:"",
+      dateRange:"",
       // 遮罩层
       loading: true,
+      fAccbilldate: '',
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -299,10 +523,17 @@ export default {
       total: 0,
       // 财务数据主表格数据
       feeList: [],
+      // 客户(客户数据)
+      fMblnoOptions: [],
+      fFeeunitidOptions: [],
+      fWbuOptions: [],
+      KHblnoOptions: [],
+
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      dialogVisible: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -345,8 +576,13 @@ export default {
     this.getList();
   },
   methods: {
+     /** 打开导入表弹窗 */
+    openImportTable() {
+      this.$refs.import.show();
+    },
     /** 查询财务数据主列表 */
     getList() {
+      console.log(this)
       this.loading = true;
       listFee(this.queryParams).then(response => {
         this.feeList = response.rows;
@@ -380,7 +616,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.resetForm("form");
+      // this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -414,6 +650,18 @@ export default {
         this.title = "修改财务数据主";
       });
     },
+    /** 远程模糊查询用户 */
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+      listCorps(queryParams).then((response) => {
+        this.fMblnoOptions = response.rows;
+        this.KHblnoOptions = response.rows;
+      });
+    },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -438,29 +686,54 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       this.$confirm('是否确认删除财务数据主编号为"' + fIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delFee(fIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delFee(fIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
+    // 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      this.fWbuOptions = []
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      listFees(queryParams).then((response) => {
+        console.log(response)
+        console.log("1111")
+        this.fWbuOptions = response.rows
+        // let fWbuOptions = this.fWbuOptions.concat(response.rows)
+        // this.fWbuOptions = Array.from(new Set(fWbuOptions))
+        console.log(this.fWbuOptions)
+      });
+    },
+
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportFee(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportFee(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
 </script>
+<style lang="scss" scoped>
+.btnColor{
+  border:1px solid #0f5dee;
+}
+.btnColor:hover{
+  color:#0f5dee;
+}
+</style>

src/views/warehouseBusiness/agreement/index.vue

@@ -592,16 +592,14 @@ export default {
     },
 // 远程模糊查询费用名称
     fWRemoteMethod(name) {
+      this.fWbuOptions = []
       if (name == null || name === "") {
         return false;
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name };
       listFees(queryParams).then((response) => {
         console.log(this.fWbuOptions)
-        // this.fWbuOptions = response.rows;
-        let fWbuOptions = this.fWbuOptions.concat(response.rows)
-        this.fWbuOptions = Array.from(new Set(fWbuOptions))
-        console.log(this.fWbuOptions)
+        this.fWbuOptions = response.rows
       });
     },
     // 结算方式,也可以从表t_stltypes中下拉选择，存储id，显示name字典翻译

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.2.3:9010`,
+        target: `http://192.168.137.1:9010`,
         // target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {