commit 解决bug

src/views/business/plan/components/audit/index.vue

@@ -100,6 +100,8 @@ import { formatValue } from '@/common/methods';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
 import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
+import {getUserId} from "@/services/bus/account";
+import {getLongTypeLoginID} from "@/services/bus/login";
 export default defineComponent({
     name: 'plan_audit_audit',
     components: {},
@@ -122,9 +124,10 @@ export default defineComponent({
                     const params: ErmcpHedgePlanReq = {
                         HedgePlanID: Long.fromString(props.selectedRow.hedgeplanid),
                         OperateType: 4,
-                        Remark: '通过',
+                        auditremark: '通过',
                         Currencyid: props.selectedRow.currencyid, // 结算币种id
                         Tradeuserid: props.selectedRow.tradeuserid, // 交易用户id
+                        auditid: Number(getLongTypeLoginID())
                     };
                     requestResultLoadingAndInfo(hedgePlanReq, params, loading, ['审核通过', '审核失败:']).then(() => {
                         context.emit('refresh');

src/views/platinum/platinum_agreement/list/tab/index.vue

@@ -20,7 +20,7 @@
                  :record="record"
                  @click="openComponent" />
       </template>
-      <!-- 协议类型-->
+      <!-- 协议类型-->,
         <template #isvalid="{ record }">
             <span>{{ getAgreementStatus(record.isvalid) }}</span>
         </template>

src/views/platinum/platinum_financing_information/list/tab/compoments/detail/index.vue

@@ -41,6 +41,7 @@ import { queryTableList } from '@/common/export/table';
 import { QhjContract, QueryContractLogReq } from '@/services/go/ermcp/qhj/interface';
 import { queryContractLog } from '@/services/go/ermcp/qhj';
 import Long from 'long';
+import {getFinancingStatus} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'platinum_financing_information_detail',
@@ -118,6 +119,8 @@ export default defineComponent({
         watchEffect(() => {
             if (visible.value) {
                 const data = props.selectedRow;
+
+                const addinfo = data.currisklevel === 2 ? " 需追加" + data.reckonrecovermargin + "元" : ""
                 // 个人
                 const person = [
                     { label: '账号', value: formatValue(data.logincode) },
@@ -130,7 +133,7 @@ export default defineComponent({
                     { label: '已付款', value: formatValue(data.payamount) },
                     { label: '融资额', value: formatValue(data.remainamount) },
                     { label: '融资时间', value: formatValue(data.contractconfirmtime) },
-                    { label: '状 态', value: getStatus(data.scfcontracttype), className: 'red' },
+                    { label: '状 态', value: getFinancingStatus(data.currisklevel, data.reckonrecovermargin.toString()) + addinfo},
                 ];
 
                 getDesList(person);
@@ -147,6 +150,7 @@ export default defineComponent({
             loading,
             tableList,
             columns,
+            getFinancingStatus,
         };
     },
 });

src/views/report/exposure-report/list/exposure_report/index.vue

@@ -1,138 +1,172 @@
 <template>
-  <!-- 敞口报表 -->
-  <div class="table-detail-container table-height"
-       :loading="loading">
-    <Filter @update="search"></Filter>
-    <a-table :columns="columns"
-             class="topOrderTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-    </a-table>
-    <!-- 明细 -->
-    <Description v-if="visible"
-                 @close="closeDrawer"
-                 @changeTab="changeTab"
-                 :columns="columnsDetail"
-                 :tabList="tabList"
-                 :tableList="detailTableList" />
-  </div>
+    <!-- 敞口报表 -->
+    <div class="table-detail-container table-height"
+         :loading="loading">
+        <Filter @update="search"></Filter>
+        <a-table :columns="columns"
+                 class="topOrderTable"
+                 :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+                 :pagination="false"
+                 :expandedRowKeys="expandedRowKeys"
+                 :customRow="Rowclick"
+                 rowKey="key"
+                 :data-source="tableList">
+        </a-table>
+        <!-- 明细 -->
+        <Description v-if="visible"
+                     @close="closeDrawer"
+                     @changeTab="changeTab"
+                     :columns="columnsDetail"
+                     :tabList="tabList"
+                     :tableList="detailTableList">
+            <!-- 合同类型 -->
+            <template #contracttype="{ record }">
+                <a>{{ getContractTypeName(record.contracttype) }}</a>
+            </template>
+        </Description>
+    </div>
 </template>
 
 <script lang="ts">
-import Filter from '../../components/filterTable/index.vue';
-import { defineComponent, queryTableList } from '@/common/export/table';
-import { TypeAndTime } from '@/views/report/interface';
-import { handleInitTypeAndTime } from '@/views/report/setup';
-import { AreaExpourseReportReq, Ermcp3ExpourseReport, QryAreaExpourseHedgeplanDetailReq } from '@/services/go/ermcp/report/interface';
-import { qryAreaExpourseContractDetail, qryAreaExpourseFutuDetail, qryAreaExpourseHedgeplanDetail, qryAreaExpourseParamChLogDetail, qryAreaExpourseReport } from '@/services/go/ermcp/report';
-import { ComposeTableDetailParam, handleComposeTable_detail } from '@/common/setup/table/compose';
-import Description from '@/common/components/description/index.vue';
-import { watchEffect } from 'vue';
-import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { TabList } from '@/common/components/description/interface';
+    import Filter from '../../components/filterTable/index.vue';
+    import {defineComponent, queryTableList} from '@/common/export/table';
+    import {TypeAndTime} from '@/views/report/interface';
+    import {handleInitTypeAndTime} from '@/views/report/setup';
+    import {
+        AreaExpourseReportReq,
+        Ermcp3ExpourseReport,
+        QryAreaExpourseHedgeplanDetailReq
+    } from '@/services/go/ermcp/report/interface';
+    import {
+        qryAreaExpourseContractDetail,
+        qryAreaExpourseFutuDetail,
+        qryAreaExpourseHedgeplanDetail,
+        qryAreaExpourseParamChLogDetail,
+        qryAreaExpourseReport
+    } from '@/services/go/ermcp/report';
+    import {ComposeTableDetailParam, handleComposeTable_detail} from '@/common/setup/table/compose';
+    import Description from '@/common/components/description/index.vue';
+    import {watchEffect} from 'vue';
+    import {queryResultLoadingAndInfo} from '@/common/methods/request/resultInfo';
+    import {TabList} from '@/common/components/description/interface';
+    import {getContractTypeName} from "@/common/constants/enumsName";
 
-export default defineComponent({
-    name: 'exposure-report',
-    components: {
-        Filter,
-        Description,
-    },
-    setup() {
-        let cycletime = '';
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3ExpourseReport>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            const { getInitTime, getInitType } = handleInitTypeAndTime();
-            cycletime = getInitTime();
-            const param: AreaExpourseReportReq = {
-                cycletype: getInitType(),
-                cycletime,
-                querytype: 1,
-            };
+    export default defineComponent({
+        name: 'exposure-report',
+        components: {
+            Filter,
+            Description,
+        },
+        setup() {
+            let cycletime = '';
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList<Ermcp3ExpourseReport>();
             // 获取列表数据
-            queryTable(qryAreaExpourseReport, param);
-        };
-        const param: ComposeTableDetailParam = {
-            queryFn: queryTableAction, // 查询表格数据
-            tableName: 'table_pcweb_exposure_report', // 表头key
-            tableFilterKey: [], // 表格过滤字段
-            menuType: 'exposure_report_exposure', // 当前tab页对应的code
-        };
-        const {
-            visible,
-            closeDrawer, // 控制 drawer 组件是否显示
-            columns,
-            updateColumn, //  表头数据
-            columnsDetail,
-            registerColumnDetail,
-            detailTableList, // 明细表头数据
-            expandedRowKeys,
-            selectedRow,
-            Rowclick, // 表格事件
-            tabList,
-        } = handleComposeTable_detail<Ermcp3ExpourseReport>(param);
-
-        // 切换明细
-        function changeTab(index: number, current: TabList) {
-            const { code, lable } = current;
-            const data = selectedRow.value as Ermcp3ExpourseReport;
-            const { cycletype, middlegoodsid } = data;
-            const param: QryAreaExpourseHedgeplanDetailReq = {
-                middlegoodsid,
-                cycletype,
-                cycletime,
+            const queryTableAction = () => {
+                const {getInitTime, getInitType} = handleInitTypeAndTime();
+                cycletime = getInitTime();
+                const param: AreaExpourseReportReq = {
+                    cycletype: getInitType(),
+                    cycletime,
+                    querytype: 1,
+                };
+                // 获取列表数据
+                queryTable(qryAreaExpourseReport, param);
+            };
+            const param: ComposeTableDetailParam = {
+                queryFn: queryTableAction, // 查询表格数据
+                tableName: 'table_pcweb_exposure_report', // 表头key
+                tableFilterKey: [], // 表格过滤字段
+                menuType: 'exposure_report_exposure', // 当前tab页对应的code
             };
-            let fn = null;
-            if (code === 'exposure_report_exposure_contract_changes') {
-                // 现货合同变动量明细
-                // 注册表头
-                registerColumnDetail('table_pcweb_change_in_spot_contract', []);
-                fn = qryAreaExpourseContractDetail;
-            } else if (code === 'exposure_report_exposure_hedging_plan') {
-                // 套保计划变动量明细
-                // 注册表头
-                registerColumnDetail('table_pcweb_change_in_hedging_plan', []);
-                fn = qryAreaExpourseHedgeplanDetail;
-            } else if (code === 'exposure_report_exposure_futures_changes') {
-                // 期货变动量明细
-                // 注册表头
-                registerColumnDetail('table_pcweb_change_in_future', []);
-                fn = qryAreaExpourseFutuDetail;
-            } else if (code === 'exposure_report_exposure_parameter_adjustment_changes') {
-                // 参数调整变动量明细
-                // 注册表头
-                registerColumnDetail('table_pcweb_change_in_parameter_adjustment', []);
-                fn = qryAreaExpourseParamChLogDetail;
-            } else {
-                console.error(`${lable}没有配置对应的code: ${code},`);
-                return;
+            const {
+                visible,
+                closeDrawer, // 控制 drawer 组件是否显示
+                columns,
+                updateColumn, //  表头数据
+                columnsDetail,
+                registerColumnDetail,
+                detailTableList, // 明细表头数据
+                expandedRowKeys,
+                selectedRow,
+                Rowclick, // 表格事件
+                tabList,
+            } = handleComposeTable_detail<Ermcp3ExpourseReport>(param);
+
+            // 切换明细
+            function changeTab(index: number, current: TabList) {
+                const {code, lable} = current;
+                const data = selectedRow.value as Ermcp3ExpourseReport;
+                const {cycletype, middlegoodsid} = data;
+                const param: QryAreaExpourseHedgeplanDetailReq = {
+                    middlegoodsid,
+                    cycletype,
+                    cycletime,
+                };
+                let fn = null;
+                if (code === 'exposure_report_exposure_contract_changes') {
+                    // 现货合同变动量明细
+                    // 注册表头
+                    registerColumnDetail('table_pcweb_change_in_spot_contract', []);
+                    fn = qryAreaExpourseContractDetail;
+                } else if (code === 'exposure_report_exposure_hedging_plan') {
+                    // 套保计划变动量明细
+                    // 注册表头
+                    registerColumnDetail('table_pcweb_change_in_hedging_plan', []);
+                    fn = qryAreaExpourseHedgeplanDetail;
+                } else if (code === 'exposure_report_exposure_futures_changes') {
+                    // 期货变动量明细
+                    // 注册表头
+                    registerColumnDetail('table_pcweb_change_in_future', []);
+                    fn = qryAreaExpourseFutuDetail;
+                } else if (code === 'exposure_report_exposure_parameter_adjustment_changes') {
+                    // 参数调整变动量明细
+                    // 注册表头
+                    registerColumnDetail('table_pcweb_change_in_parameter_adjustment', []);
+                    fn = qryAreaExpourseParamChLogDetail;
+                } else {
+                    console.error(`${lable}没有配置对应的code: ${code},`);
+                    return;
+                }
+                // 查询明细数据
+                queryResultLoadingAndInfo(fn, loading, param).then((res) => {
+                    detailTableList.value = res;
+                });
             }
-            // 查询明细数据
-            queryResultLoadingAndInfo(fn, loading, param).then((res) => {
-                detailTableList.value = res;
-            });
-        }
-        watchEffect(() => {
-            if (visible.value) {
-                if (tabList.value.length) {
-                    changeTab(0, tabList.value[0]);
+
+            watchEffect(() => {
+                if (visible.value) {
+                    if (tabList.value.length) {
+                        changeTab(0, tabList.value[0]);
+                    }
                 }
+            });
+
+            function search(value: TypeAndTime) {
+                cycletime = value.cycletime;
+                const obj = Object.assign(value, {querytype: 1});
+                queryTable(qryAreaExpourseReport, obj);
             }
-        });
-        function search(value: TypeAndTime) {
-            cycletime = value.cycletime;
-            const obj = Object.assign(value, { querytype: 1 });
-            queryTable(qryAreaExpourseReport, obj);
-        }
 
-        return { loading, tableList, visible, closeDrawer, columns, updateColumn, search, columnsDetail, detailTableList, expandedRowKeys, selectedRow, Rowclick, tabList, changeTab };
-    },
-});
+            return {
+                loading,
+                tableList,
+                visible,
+                closeDrawer,
+                columns,
+                updateColumn,
+                search,
+                columnsDetail,
+                detailTableList,
+                expandedRowKeys,
+                selectedRow,
+                Rowclick,
+                tabList,
+                changeTab,
+                getContractTypeName
+            };
+        },
+    });
 </script>
 
 <style lang="less">