Jelajahi Sumber

Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

翁玉文 4 tahun lalu
induk
melakukan
48a5222375

+ 70 - 0
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
+  })
+}

+ 5 - 3
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))
       });
     },
     // 作业费状态修改

+ 715 - 0
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>

+ 1 - 1
src/views/finance/contrast/index.vue

@@ -695,7 +695,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.resetForm("form");
+      // this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {

+ 2 - 4
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字典翻译

+ 1 - 1
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: {