订单列表、详情增加余额抵扣显示，客户信息增加余额与余额记录显示

src/views/tirePartsMall/basicData/customerInformation/check_green_recycling_record.vue

@@ -0,0 +1,76 @@
+<template>
+    <el-dialog title="现金余额记录" :visible.sync="show" append-to-body width="60%">
+        <el-table
+            :data="recordData"
+            border
+            stripe
+            height="600"
+            max-height="600"
+            style="width: 100%">
+            <el-table-column
+                prop="originalQuota"
+                align="center"
+                label="原额度">
+            </el-table-column>
+            <el-table-column
+                prop="adjustableQuota"
+                align="center"
+                label="变动额度">
+            </el-table-column>
+            <el-table-column
+                prop="adjustedQuota"
+                align="center"
+                label="变动后额度">
+            </el-table-column>
+            <el-table-column
+                prop="changeType"
+                align="center"
+                label="变动类型">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.changeType === 0">
+                        充值
+                    </el-tag>
+                    <el-tag v-if="scope.row.changeType === 1">
+                        支出
+                    </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="changeUserName"
+                align="center"
+                label="变动人">
+            </el-table-column>
+            <el-table-column
+                prop="changeTime"
+                align="center"
+                label="变动时间">
+            </el-table-column>
+        </el-table>
+    </el-dialog>
+
+</template>
+
+<script>
+import {getCustomerGreenRecyclingRecordList} from "@/api/tirePartsMall/cycling/cycling";
+
+export default {
+    name: "check_green_recycling_record",
+    data() {
+        return {
+            show: false,
+            recordData: []
+        }
+    },
+    methods: {
+        getList(customerId){
+            getCustomerGreenRecyclingRecordList({customerId: customerId}).then(res => {
+                this.recordData = res.data.data
+            })
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -50,6 +50,13 @@
                 @click="limitPopupfun"></i>
             </div>
           </template>
+            <template slot="recoveredBalance">
+                <div style="display:flex;">
+                    <el-input v-model="form.recoveredBalance" disabled size="small" placeholder="请输入额度"></el-input>
+                    <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
+                       @click="openRecordDialog"></i>
+                </div>
+            </template>
         </avue-form>
       </trade-card>
       <trade-card title="客户联系人" v-loading="loadingBtn">
@@ -143,6 +150,7 @@
         <el-button type="primary" @click="limitrecordSubmitfun">确 定</el-button>
       </span>
     </el-dialog>
+      <check_green_recycling_record ref="checkGreenRecyclingRecordRef"/>
   </div>
 </template>
 
@@ -170,6 +178,7 @@ import {
 } from "@/api/tirePartsMall/basicData/warehouse";
 import limitrecord from "@/views/tirePartsMall/basicData/customerInformation/components/limitrecord.vue";
 import { limitrecordSubmit } from "@/api/tirePartsMall/basicData/customerInformation/limitrecord";
+import check_green_recycling_record from "@/views/tirePartsMall/basicData/customerInformation/check_green_recycling_record.vue";
 
 export default {
   name: "index",
@@ -434,7 +443,7 @@ export default {
           },
           {
             label: "业务员",
-            span: 8,
+            span: 12,
             prop: "salesmanId",
             type: "select",
             props: {
@@ -462,12 +471,12 @@ export default {
           {
             label: "账期",
             prop: "accountPeriod",
-            span: 8,
+            span: 12,
           },
           {
             label: "发货仓库",
             prop: "deliveryWarehouseId",
-            span: 8,
+            span: 12,
             type: 'select',
             props: {
               label: 'cname',
@@ -480,10 +489,27 @@ export default {
               trigger: "blur"
             }]
           },
+/*            {
+                label: "资源仓库",
+                prop: "resourceWarehouseList",
+                span: 12,
+                type: 'select',
+                multiple: true,
+                props: {
+                    label: 'cname',
+                    value: 'id'
+                },
+                dicUrl: '/api/blade-sales-part/storageDesc/listAll',
+                rules: [{
+                    required: true,
+                    message: " ",
+                    trigger: "blur"
+                }]
+            },*/
           {
             label: "商城价格",
             prop: "priceSystem",
-            span: 8,
+            span: 6,
             filterable: true,
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=mall_price",
@@ -500,7 +526,7 @@ export default {
           {
             label: "是否使用额度",
             prop: "ifLimitAmount",
-            span: 8,
+            span: 4,
             type: "switch",
             dicData: [{
               label: '否',
@@ -518,6 +544,15 @@ export default {
             controls: false,
             precision: 2,
           },
+            {
+                label: "现金余额",
+                prop: "recoveredBalance",
+                span: 6,
+                type: "number",
+                controls: false,
+                precision: 2,
+                disabled:true,
+            },
           {
             label: "积分余额",
             prop: "pointsBalance",
@@ -649,7 +684,8 @@ export default {
   },
   components: {
     corpType,
-    limitrecord
+    limitrecord,
+      check_green_recycling_record
   },
   props: {
     detailData: {
@@ -690,6 +726,10 @@ export default {
     }, 100)
   },
   methods: {
+      openRecordDialog(){
+          this.$refs.checkGreenRecyclingRecordRef.getList(this.form.id)
+          this.$refs.checkGreenRecyclingRecordRef.show = true
+      },
     // 获取业务员数据
     getUserByRolefun() {
       getUserByRole().then(res => {

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -777,6 +777,10 @@ export default {
                     prop: "totalMoney",
                     disabled: true
                 }, {
+                        label: '余额抵扣',
+                        prop: "paymentRecoveredBalance",
+                        overHidden: true,
+                    }, {
                     label: '已收金额',
                     prop: "paymentAmountTl",
                     disabled: true

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -330,6 +330,10 @@ export default {
           prop: "paymentAmountTl",
           overHidden: true,
         }, {
+                label: '余额抵扣',
+                prop: "paymentRecoveredBalance",
+                overHidden: true,
+            }, {
           label: '退货数量',
           prop: "returnsNumber",
           overHidden: true,
@@ -385,7 +389,7 @@ export default {
           label: '退货状态',
           prop: "returnsStatus",
           overHidden: true,
-        }, 
+        },
         {
           label: '备注',
           prop: "remarks",