commit

src/common/components/commonDes/commonDes.vue

@@ -47,5 +47,18 @@ export default defineComponent({
 
 <style lang="less">
 .commom-des {
+    .ant-descriptions-item-label {
+        display: inline-block;
+        width: 130px;
+        line-height: 30px;
+        padding-left: 16px;
+        color: @m-grey1;
+        &::after {
+            content: '';
+        }
+    }
+    .ant-descriptions-item-content {
+        color: @m-grey1;
+    }
 }
 </style>;

src/router/index.ts

@@ -528,26 +528,60 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/finance_report',
                 name: 'finance_report',
-                component: () => import('@/views/report/finance-report/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
+                redirect: { name: 'finance_report_finance' },
+                children: [
+                    {
+                        path: '/finance_report/finance',
+                        name: 'finance_report_finance',
+                        component: () => import('@/views/report/finance-report/list/finance_report_finance/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                ]
             },
             {
                 path: '/inventory_report',
                 name: 'inventory_report',
-                component: () => import('@/views/report/inventory-report/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
+                redirect: { name: 'inventory_report_inventory' },
+                children: [
+                    {
+                        path: '/inventory_report/inventory',
+                        name: 'inventory_report_inventory',
+                        component: () => import('@/views/report/inventory-report/list/inventory_report_inventory/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                ]
             },
+
             {
                 path: '/spot_report',
                 name: 'spot_report',
-                component: () => import('@/views/report/spot-report/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
+                redirect: { name: 'spot_report_spot' },
+                children: [
+                    {
+                        path: '/spot_report/spot',
+                        name: 'spot_report_spot',
+                        component: () => import('@/views/report/spot-report/list/spot_report/index.vue'),
+                        meta: {
+                            requireAuth: true,
+                        },
+                    },
+                ]
             },
         ],
     },

src/services/request/serviceURL.ts

@@ -77,10 +77,10 @@ export const getUplodaUrl = (): string => {
 export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
     // 外网环境（175），外包同事使用
-    // if (process.env.NODE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
         serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
         serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
         serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    // }
-    // serviceURL = config;
+    }
+    serviceURL = config;
 };

src/views/information/spot-contract/components/check/index.vue

@@ -279,9 +279,25 @@ export default defineComponent({
                     okText: '审核通过',
                     cancelText: '取消',
                     onOk() {
-                        const reqParam: SpotContractOperateReq = {
+
+                        // 为什么不删 因为以后可能又改回来
+                        // const reqParam: SpotContractOperateReq = {
+                        //     SpotContractID: props.selectedRow.spotcontractid,
+                        //     OperateType: 3,
+                        //     Remark: param.Remark,
+                        //     Info: {
+                        //         BizType: props.selectedRow.biztype,
+                        //         MerUserID: param.MerUserID as number, //    跟单员ID
+                        //         SaleUserID: param.SaleUserID as number, //   业务员ID
+                        //         TradeUserID: param.TradeUserID as number, //  交易员ID
+                        //         Remark: param.Remark,
+                        //         UserID: getUserId(),
+                        //     },
+                        // };
+
+                        const reqParam: GldErmcpSpotContractOperateReq = {
                             SpotContractID: props.selectedRow.spotcontractid,
-                            OperateType: 3,
+                            OperateType: 4,
                             Remark: param.Remark,
                             Info: {
                                 BizType: props.selectedRow.biztype,
@@ -290,11 +306,14 @@ export default defineComponent({
                                 TradeUserID: param.TradeUserID as number, //  交易员ID
                                 Remark: param.Remark,
                                 UserID: getUserId(),
+                                CurrencyID: props.selectedRow.currencyid,  // 币种id
                             },
                         };
                         // Fixme 6/4 代码修改
                         // 审核通过 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
-                        requestResultLoadingAndInfo(spotContractStatus, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
+                        // Fixme 6/9 代码修改
+                        // 审核通过 GldErmcpSpotContractOperateReq 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
+                        requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
                             context.emit('refresh');
                             cancel();
                         });

src/views/report/finance-report/index.vue

@@ -1,23 +0,0 @@
-<template>
-  <!-- 财务报表 -->
-  <div class="finance-report">
-    财务报表
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-    name: 'finance-report',
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-.finance-report {
-}
-</style>;

src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -1,16 +1,36 @@
 <template>
   <!-- 财务报表 -->
-  <div class="finance-report">
-    财务报表
+  <div class="finance-report"
+       :loading="loading">
+    <Filter @search="search"></Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <!-- <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList"> -->
+      <!-- 额外的展开行 -->
+      <!-- <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template> -->
+      <!-- </a-table> -->
+    </contextMenu>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import Filter from '../../components/filterTable/index.vue';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 
 export default defineComponent({
     name: 'finance-report',
-    components: {},
+    components: {
+        Filter,
+        contextMenu,
+        BtnList,
+    },
     setup() {
         return {};
     },

src/views/report/inventory-report/index.vue

@@ -1,23 +0,0 @@
-<template>
-  <!-- 库存报表-->
-  <div class="inventory-report">
-    库存报表
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-    name: 'inventory-report',
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-.inventory-report {
-}
-</style>;

src/views/report/inventory-report/list/inventory_report_inventory/index.vue

@@ -1,16 +1,36 @@
 <template>
   <!-- 库存报表-->
-  <div class="inventory-report">
-    库存报表
+  <div class="inventory-report"
+       :loading="loading">
+    <Filter @search="search"></Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <!-- <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList"> -->
+      <!-- 额外的展开行 -->
+      <!-- <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template> -->
+      <!-- </a-table> -->
+    </contextMenu>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import Filter from '../../components/filterTable/index.vue';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 
 export default defineComponent({
     name: 'inventory-report',
-    components: {},
+    components: {
+        Filter,
+        contextMenu,
+        BtnList,
+    },
     setup() {
         return {};
     },

src/views/report/spot-report/index.vue

@@ -1,23 +0,0 @@
-<template>
-  <!-- 现货报表 -->
-  <div class="spot-report">
-    现货报表
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-    name: 'spot-report',
-    components: {},
-    setup() {
-        return {};
-    },
-});
-</script>
-
-<style lang="less">
-.spot-report {
-}
-</style>;

src/views/report/spot-report/list/spot_report/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <!-- 现货报表 -->
+  <div class="spot-report"
+       :loading="loading">
+    <Filter @search="search"></Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <!-- <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList"> -->
+      <!-- 额外的展开行 -->
+      <!-- <template #expandedRowRender="{ record }">
+                    <BtnList :btnList="record.btnList"/>
+                </template> -->
+      <!-- </a-table> -->
+    </contextMenu>
+  </div>
+</template>
+
+<script lang="ts">
+import Filter from '../../components/filterTable/index.vue';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+
+export default defineComponent({
+    name: 'spot-report',
+    components: {
+        Filter,
+        contextMenu,
+        BtnList,
+    },
+    setup() {
+        return {};
+    },
+});
+</script>
+
+<style lang="less">
+.spot-report {
+}
+</style>;