Merge branch 'feature/Feature-basic_data' into develop

src/api/engin_deposit/refund_list.js

@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+// 押金管理列表
+export function getDepositManageList(params) {
+  return request({
+    url: "/deposit-manage/list",
+    method: "get",
+    params,
+  });
+}
+// 押金管理详情
+export function getDepositManageDetail(params) {
+  return request({
+    url: "/deposit-manage/detail",
+    method: "get",
+    params,
+  });
+}
+// 审批退押
+export function getDepositManageExamine(data) {
+  return request({
+    url: "/deposit-manage/examine",
+    method: "post",
+    data,
+  });
+}

src/views/basic_data/dealer/dealer_stock.vue

@@ -216,6 +216,7 @@
             v-model="addForm.mainId"
             placeholder="请选择"
             filterable
+            @change="changeSelectFn"
           >
             <el-option
               v-for="item in categoryList"
@@ -328,6 +329,7 @@ export default {
         serviceId: "",
         mainId: "",
       },
+      mainId: null,
       rules: {
         mainId: [
           { required: true, message: "请选择存货分类", trigger: "blur" },
@@ -388,13 +390,19 @@ export default {
     },
     "addForm.oneParentId": async function (newValue) {
       if (newValue) {
-        let res = await getAdminWebsitByparent({ parentId: newValue });
+        let res = await getAdminWebsitByparent({
+          parentId: newValue,
+          mainId: this.mainId,
+        });
         this.twoList = res.data;
       }
     },
     "addForm.twoParentId": async function (newValue) {
       if (newValue) {
-        let res = await getAdminWebsitByparent({ parentId: newValue });
+        let res = await getAdminWebsitByparent({
+          parentId: newValue,
+          mainId: this.mainId,
+        });
         this.threeList = res.data;
       }
     },
@@ -411,6 +419,12 @@ export default {
     },
   },
   methods: {
+    //改变产品大类
+    changeSelectFn(value) {
+      const res = this.categoryList.filter((v) => v.productCategoryId == value);
+      console.log(res);
+      this.mainId = res[0].productCategoryNumber;
+    },
     //编辑
 
     async editFn(id) {
@@ -433,7 +447,10 @@ export default {
     },
     //根据父级查询部门
     async getAdminWebsit(data) {
-      let res = await getAdminWebsitByparent({ parentId: data });
+      let res = await getAdminWebsitByparent({
+        parentId: data,
+        mainId: this.mainId,
+      });
       this.oneList = res.data;
     },
     //获取产品品类数据

src/views/engin_deposit/components/refund_list-detail.vue

@@ -11,63 +11,97 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">工程登录编码</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.refEnginRecordNo }}</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">工程名称(项目名称)</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.refProjectName }}</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">工程编号</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.refProjectNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">经销商名称</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.customerName }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.customerId }}</div>
         </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">经销商二级代码</div>
+          <div class="value">{{detailList.}}</div>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">工程登录类型</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.refPromiseStatus }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">厂工程编码</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">联系人</div>
+          <div class="value">{{ detailList.refLinkman }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">使用单位</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">固定电话</div>
+          <div class="value">{{ detailList.refTel }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">厂工程编码(G编码)</div>
+          <div class="value">
+            <el-input v-model="detailList.refFactoryNo"></el-input>
+          </div>
         </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">押金比例</div>
+          <div class="value">{{detailList.}}</div>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">扣款总额</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">移动电话</div>
+          <div class="value">{{ detailList.refPhone }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">押金比例</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">押金总额</div>
+          <div class="value">{{ detailList.depositAmount }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">安装时间</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">工程价差总额</div>
+          <div class="value">{{ detailList.depositDiffAmount }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">押金总额</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">使用单位</div>
+          <div class="value">{{ detailList.refUseUnit }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">退款总额</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">寄厂日期</div>
+          <div class="value">
+            <el-date-picker
+              class="selectStyle"
+              v-model="detailList.sendFactoryDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </div>
         </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">提货日期</div>
+          <div class="value">{{detailList.}}</div>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">寄厂日期</div>
-          <div class="value">2022123233435342</div>
+          <div class="label">安装时间</div>
+          <div class="value">
+            <el-date-picker
+              class="selectStyle"
+              v-model="detailList.installDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </div>
         </el-col>
       </el-row>
     </div>
@@ -78,7 +112,7 @@
       <div class="table">
         <el-table
           v-loading="listLoading"
-          :data="dataList"
+          :data="detailList.items"
           element-loading-text="Loading"
           border
           fit
@@ -87,60 +121,82 @@
         >
           <el-table-column
             align="center"
+            label="物料编码"
+            prop="materialOldNumber"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
             label="产品编码"
-            prop=""
+            prop="materialNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="产品名称"
-            prop=""
+            prop="materialName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="规格型号"
-            prop=""
+            prop="specification"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="单价"
-            prop=""
+            prop="price"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="数量"
-            prop=""
+            prop="qty"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="金额"
-            prop=""
+            prop="totalAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="押金金额"
-            prop=""
+            label="发货数量"
+            prop="hasSendQty"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="上交资料"
-            prop=""
+            label="上传资料"
+            prop="dataQty"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.dataQty"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="收差金额"
+            prop="diffAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.diffAmount"></el-input>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -151,7 +207,7 @@
       <div class="table">
         <el-table
           v-loading="listLoading"
-          :data="dataList"
+          :data="detailList.dataList"
           element-loading-text="Loading"
           border
           fit
@@ -161,28 +217,28 @@
           <el-table-column
             align="center"
             label="资料描述"
-            prop=""
+            prop="dataDescribe"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="原文件名"
-            prop=""
+            prop="fileName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="缩略图"
-            prop=""
+            prop="fileUrl"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="下载文件名称"
-            prop=""
+            prop="fileName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -206,15 +262,15 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.createBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">申请日期</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ detailList.createTime }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item">
-          <div class="label">申请免扣押金</div>
-          <div class="value">************</div>
+          <div class="label">申请退押金</div>
+          <div class="value">{{ detailList.applyNote }}</div>
         </el-col>
       </el-row>
     </div>
@@ -224,36 +280,35 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">验收人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ this.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">验收日期</div>
           <div class="value">
-            <el-date-picker type="date" placeholder=""> </el-date-picker>
+            <el-date-picker
+              class="selectStyle"
+              v-model="checkDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
           </div>
         </el-col>
-        <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">是否免押金</div>
+        <el-col :xs="12" :sm="24" :lg="24" class="item">
+          <div class="label">是否退押</div>
           <div class="value">
-            <el-radio-group>
+            <el-radio-group v-model="isRefundDeposit">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </div>
         </el-col>
-        <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">审批结果</div>
-          <div class="value">
-            <el-radio-group>
-              <el-radio :label="true">同意</el-radio>
-              <el-radio :label="false">驳回</el-radio>
-            </el-radio-group>
-          </div>
-        </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item">
-          <div class="label">审批说明</div>
+          <div class="label">验收说明</div>
           <div class="value">
-            <el-input placeholder="请输入内容"></el-input>
+            <el-input v-model="checkNote" placeholder="请输入内容"></el-input>
           </div>
         </el-col>
       </el-row>
@@ -262,16 +317,78 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small">提交审批</el-button>
-        <el-button type="primary" size="small">重置</el-button>
+        <el-button type="primary" size="small" @click="adoptFn"
+          >审批通过</el-button
+        >
+        <el-button type="primary" size="small" @click="rejectFn"
+          >审批驳回</el-button
+        >
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { mapGetters } from "vuex";
+import {
+  getDepositManageDetail,
+  getDepositManageExamine,
+} from "@/api/engin_deposit/refund_list";
 export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    ...mapGetters(["name"]),
+  },
+  data() {
+    return {
+      listLoading: false, // 列表加载loading
+      dataList: [], // 列表数据
+      detailList: {},
+      checkBy: "",
+      checkDate: null,
+      isRefundDeposit: true,
+      checkNote: "",
+    };
+  },
+  created() {
+    this.checkBy = this.name;
+    this.getData({ id: this.detailId });
+  },
   methods: {
+    //审批驳回
+    async rejectFn() {
+      let data = {
+        ...this.detailList,
+        checkBy: this.checkBy,
+        checkDate: this.checkDate,
+        isRefundDeposit: this.isRefundDeposit,
+        checkNote: this.checkNote,
+        examineResult: 0,
+      };
+      await getDepositManageExamine(data);
+    },
+    //审批通过
+    async adoptFn() {
+      let data = {
+        ...this.detailList,
+        checkBy: this.checkBy,
+        checkDate: this.checkDate,
+        isRefundDeposit: this.isRefundDeposit,
+        checkNote: this.checkNote,
+        examineResult: 1,
+      };
+      await getDepositManageExamine(data);
+    },
+    async getData(data) {
+      const res = await getDepositManageDetail(data);
+      console.log(res);
+      this.detailList = res.data;
+    },
     goBack() {
       this.$parent.showSurrender = true;
     },
@@ -283,4 +400,7 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+.label {
+  width: 150px !important;
+}
+</style>

src/views/engin_deposit/refund_list.vue

@@ -14,13 +14,13 @@
         <el-form
           ref="searchForm"
           :model="searchForm"
-          label-width="100px"
+          label-width="160px"
           size="small"
           label-position="left"
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程订单编号" prop="">
+              <el-form-item label="工程登录(信息)编号" prop="">
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -71,13 +71,6 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
-        <div class="fl">
-          <el-button type="primary" size="small" @click="examineFn"
-            >审批</el-button
-          >
-
-          <el-button type="primary" size="small">详情</el-button>
-        </div>
         <div class="fr">
           <el-button type="primary" size="small">导出</el-button>
         </div>
@@ -97,49 +90,35 @@
             <el-table-column
               align="center"
               label="工程登录编码"
-              prop=""
+              prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="工程名称"
-              prop=""
+              prop="refProjectName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="经销商编码"
-              prop=""
+              prop="customerId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="经销商名称"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="是否免扣"
-              prop=""
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="押金比例"
-              prop=""
+              prop="customerName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="押金金额"
-              prop=""
+              prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -149,21 +128,29 @@
               prop=""
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template v-slot="{ row }">
+                <el-tag v-show="row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag v-show="row.examineStatus == 'WAIT'">保存</el-tag>
+                <el-tag v-show="row.examineStatus == 'OK'">保存</el-tag>
+                <el-tag v-show="row.examineStatus == 'FAIL'">保存</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="操作"
               min-width="160"
               show-overflow-tooltip
             >
-              <template slot-scope="">
-                <el-button type="text" class="textColor" slot="reference"
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="examineFn(scope.row.depositManageId)"
                   >审批</el-button
                 >
 
-                <el-button type="text" class="textColor" slot="reference"
-                  >详情</el-button
-                >
+                <el-button type="text" class="textColor">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -181,11 +168,12 @@
         </div>
       </div>
     </div>
-    <RefundListDetail v-else />
+    <RefundListDetail :detailId="detailId" v-else />
   </div>
 </template>
 
 <script>
+import { getDepositManageList } from "@/api/engin_deposit/refund_list";
 import RefundListDetail from "./components/refund_list-detail.vue";
 export default {
   components: {
@@ -201,10 +189,34 @@ export default {
       listLoading: false, // 列表加载loading
       examine: "全部",
       showSurrender: true,
+      detailId: "",
     };
   },
+  created() {
+    this.getDataList({
+      pageSize: this.pageSize,
+      pageNum: this.currentPage,
+      confirmName: "",
+      createName: "",
+      customerKeyword: "",
+      endDeliverTime: "",
+      enginOrderNo: "",
+      enginOrderType: "",
+      examineStatus: "",
+      refEnginRecordNo: "",
+      refProjectName: "",
+      refUseUnit: "",
+      startDeliverTime: "",
+    });
+  },
   methods: {
-    examineFn() {
+    async getDataList(data) {
+      const res = await getDepositManageList(data);
+      this.dataList = res.data.records;
+      this.listTotal = res.data.total;
+    },
+    examineFn(id) {
+      this.detailId = id;
       this.showSurrender = false;
     },
   },
@@ -215,4 +227,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/finance/change_list.vue

@@ -102,29 +102,29 @@
             ></el-table-column>
             <el-table-column
               align="center"
-              label="经销商编号"
+              label="发起方经销商编号"
               prop="customerNumber"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="经销商名称"
+              label="发起方经销商名称"
               prop="customerName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="表体备注"
+              label="发起方表体备注"
               prop="initiatorRemark"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
-              label="返利类型"
-              prop=""
+              label="发起方返利类型"
+              prop="initiatorCustomerWalletName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -137,6 +137,34 @@
             ></el-table-column>
             <el-table-column
               align="center"
+              label="接收方经销商编号"
+              prop="receiverCustomerNumber"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="接收方经销商名称"
+              prop="receiverCustomerName"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="接收方表体备注"
+              prop="receiverRemark"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="接收方返利类型"
+              prop="receiverCustomerWalletName"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
               label="备注"
               prop="remark"
               min-width="160"
@@ -390,4 +418,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/finance/components/rebate_list-confirm.vue

@@ -252,13 +252,13 @@ export default {
     },
     //重置
     resetFn() {
-      console.log(this.dataList, this.saveDataList);
+      // console.log(this.dataList, this.saveDataList);
       this.dataList = this.saveDataList;
       this.saveDataList = this.deepCopy(this.dataList);
     },
     //确定
     async btnFn() {
-      console.log(this.dataList);
+      // console.log(this.dataList);
       const res = this.dataList.map((v) => {
         return {
           allowanceAmount: v.allowanceAmount,
@@ -266,11 +266,11 @@ export default {
           itemId: v.id,
         };
       });
-      console.log(res, 888);
+      // console.log(res, 888);
       await getRebateOrderAck(res);
-      // this.$emit("updateList");
-      // this.$message.success("确认成功");
-      // this.$parent.showPage = 1;
+      this.$emit("updateList");
+      this.$message.success("确认成功");
+      this.$parent.showPage = 1;
     },
     //获取详情数据
     async getDataList() {

src/views/finance/components/rebate_list-review.vue

@@ -281,7 +281,7 @@
           <el-table-column
             align="center"
             label="返利金额"
-            prop=""
+            prop="rebateAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>

src/views/finance/rebate_list.vue

@@ -463,8 +463,10 @@
                   class="textColor"
                   v-if="
                     isCustomer &&
-                    scope.row.examineStatus == 'OK_ONE' &&
-                    scope.row.withholdAmount == 0
+                    scope.row.withholdAmount == 0 &&
+                    (scope.row.examineStatus == 'OK_ONE' ||
+                      scope.row.examineStatus == 'OK' ||
+                      scope.row.examineStatus == 'FAIL')
                   "
                   @click="
                     confirmFn(
@@ -616,7 +618,12 @@ export default {
       let arr = res.data.records;
       if (this.isCustomer) {
         let arr2 = arr.filter((v) => {
-          if (v.examineStatus == "OK_ONE" && v.withholdAmount == 0) {
+          if (
+            (v.examineStatus == "OK_ONE" ||
+              v.examineStatus == "OK" ||
+              v.examineStatus == "FAIL") &&
+            v.withholdAmount == 0
+          ) {
             return v;
           }
         });

src/views/finance/receipt_list.vue

@@ -133,12 +133,20 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="币别"
               prop="bibie"
               min-width="160"
               show-overflow-tooltip
+            ></el-table-column> -->
+
+            <el-table-column
+              align="center"
+              label="钱包"
+              prop="walletName"
+              min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
@@ -168,13 +176,13 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="结算方式"
               prop="settleType"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <!-- <el-table-column
               align="center"
               label="收款用途"
@@ -185,7 +193,7 @@
             <el-table-column
               align="center"
               label="付款单位"
-              prop="customerType"
+              prop="customerName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -325,4 +333,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>