配件8月1号修改内容

src/api/financialManagement/financialManagement.js

@@ -83,3 +83,12 @@ export const corpscechargerecordSynchronous = (params) => {
     data:params
   })
 }
+
+// 会员卡消费记录
+export const consumptionRecords = (data) => {
+  return request({
+    url: '/api/blade-purchase-sales/appParts/consumptionRecords',
+    method: 'get',
+    params: data
+  })
+}

src/views/client/detailsInfo.vue

@@ -181,17 +181,34 @@
                                @search-criteria-switch="searchCriteriaSwitch">
                     </avue-crud>
                 </el-tab-pane>
+                <el-tab-pane label="会员卡金额消费记录" name="jexfjl">
+                    <avue-crud :option="hykoption"
+                               :data="hykdataList"
+                               ref="crud"
+                               v-model="hykform"
+                               :page.sync="hykmxpage"
+                               :search.sync="hykmxsearch"
+                               :table-loading="hykmxloading"
+                               @search-change="czmxsearchChange"
+                               @size-change="czmxsizeChange"
+                               @refresh-change="czmxrefreshChange"
+                               @saveColumn="czmxsaveColumn"
+                               @resetColumn="czmxresetColumn"
+                               @on-load="hykmxonLoad"
+                               @search-criteria-switch="searchCriteriaSwitch">
+                    </avue-crud>
+                </el-tab-pane>
             </el-tabs>
         </basic-container>
     </div>
 </template>
 
 <script>
-import { optionList, sellOption, capitalOption, czoption } from "./js/optionList";
+import { optionList, sellOption, capitalOption, czoption,hykoption } from "./js/optionList";
 import { getList, getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
 import { getDetails, getSellList } from "@/api/basicData/client";
 import { validatenull } from "@/util/validate";
-import {corpscechargerecordList} from "@/api/financialManagement/financialManagement";
+import {consumptionRecords, corpscechargerecordList} from "@/api/financialManagement/financialManagement";
 
 export default {
     name: "index",
@@ -234,9 +251,25 @@ export default {
             // 页码
             czmxpage: {
                 pageSize: 10,
-                pagerCount: 5,
+                pagerCount: 1,
+                total: 0,
+            },
+            // 会员卡金额消费记录配置
+            hykoption:hykoption,
+            // 会员卡的数据
+            hykdataList:[],
+            // 会员卡绑定的值
+            hykform:{},
+            // 页码
+            hykmxpage: {
+                pageSize: 10,
+                pagerCount: 1,
                 total: 0,
             },
+            // 表单搜索的变量对象
+            hykmxsearch:{},
+            hykmxloading:false,
+
             sellOption: {},
             capitalOption: {},
             sellList: [],
@@ -400,6 +433,24 @@ export default {
                 this.$refs.crud.$refs.dialogColumn.columnBox = false;
             }
         },
+        // 会员卡消费记录
+        hykmxonLoad(page,params){
+            consumptionRecords({
+                currentPage:page.currentPage,
+                pageSize:page.pageSize,
+                corpId:this.detailData.id,
+                ...params
+            }).then(res =>{
+                this.hykdataList = res.data.data.records
+                this.hykmxpage.total = res.data.data.total
+                if (this.hykmxpage.total) {
+                    this.hykoption.height = window.innerHeight - 240;
+                }
+            }).finally(()=>{
+                this.czloading = false
+            })
+        },
+
         getAllWorkDicts() {
             gainUser().then(res => {
                 this.findObject(this.sellOption.column, "createUser").dicData = res.data.data;

src/views/client/detailsPage.vue

@@ -296,7 +296,7 @@ export default {
                 span: 8,
                 filterable: true,
                 type: "select",
-                dicUrl: "api/blade-client/corpsdesc/corpsDescList?corpType=KH",
+                dicUrl: "/api/blade-client/corpsdesc/corpsDescList?corpType=KH",
                 props: {
                     label: "cname",
                     value: "id"

src/views/client/js/optionList.js

@@ -703,3 +703,46 @@ export const czoption = {
     }
   ]
 }
+
+// 会员卡金额消费记录
+export const hykoption = {
+  "width": 150,
+  "delBtn": false,
+  "editBtn": false,
+  addBtn: false,
+  "border": true,
+  "resizable": true,
+  "selection": true,
+  menu:false,
+  "column": [
+    {
+      "label": "销售单号",
+      "prop": "sysNo",
+      "overHidden": true,
+      "editDisplay": false,
+      "addDisplay": false
+    },
+    {
+      "label": "事件",
+      "prop": "businesDate",
+      "overHidden": true,
+      "type": "date",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "addDisplay": false,
+      "editDisplay": false,
+      "rules": [
+        {
+          "required": true,
+          "message": "",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "金额",
+      "prop": "memberBalance",
+      "overHidden": true,
+    }
+  ]
+}

src/views/purchaseOrder/index.vue

@@ -155,6 +155,20 @@ export default {
     detailsPage
   },
   async created() {
+      this.getWorkDicts("payment_status").then(res => {
+          const arr = res.data.data.map(item => {
+              item.dictKey = Number(item.dictKey)
+              return item
+          })
+          this.findObject(this.option.column, "actualPaymentStatus").dicData = arr
+      });
+      this.getWorkDicts("order_status_pjjl").then(res => {
+          const arr = res.data.data.map(item => {
+              item.dictKey = Number(item.dictKey)
+              return item
+          })
+          this.findObject(this.option.column, "status").dicData = arr
+      });
     this.option = await this.getColumnData(this.getColumnName(213), option);
     this.option.height = window.innerHeight - 210;
     this.getAllWorkDicts()

src/views/purchaseOrder/js/optionList.js

@@ -97,15 +97,25 @@ export const option = {
     },
     {
       label: "付款状态",
-      prop: "status",
+      prop: "actualPaymentStatus",
       type: 'select',
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 9
     },
     {
-      label: "送货状态",
+      label: "状态",
       prop: "status",
       type: 'select',
       // search: true,
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 10
     },
     {