修改 表头

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139"
+    "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204"
 }

src/services/go/wrtrade/interface.ts

@@ -440,6 +440,7 @@ export interface QueryPerformancePlanReq {
  * 查询履约信息返回
  */
 export interface WrPerformancePlan {
+    activatemonth: string;//履约激活月 无仓单的交易收月
     amount: number;//履约金额(总金额)
     buyaccountid: number;//买方账号
     buyerfreezeamount: number;//履约冻结(买履约)
@@ -493,6 +494,7 @@ export interface WrPerformancePlan {
     steptypeid: number;//履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 1number;
     //:货款溢短 11:生成合同[中江] 12:运费 9number;
     //:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
+    typename: string;//履约类型 名称
     unpaidamount: number;//剩余款(待支付金额)
     userid: number;//用户id
     warehouseid: number;//仓库ID

src/views/order/performance_information/components/performance_information_buy_performance/index.vue

@@ -1,70 +1,69 @@
 <template>
-    <!-- 买履约 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '190px' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            :expandIcon="expandIcon"
-            :expandIconAsCell="false"
-            rowKey="key"
-            :data-source="tableList"
-        >
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList
-                    :btnList="handleBtn(btnList, record)"
-                    :record="record"
-                    class="btn-list-sticky"
-                    @click="openComponent"
-                />
-            </template>
-            <!-- 履约类型 -->
-            <template #performancetype="{ record }">
-                <a>{{ getPerformanceTypeName(record.performancetype, record.haswr) }}</a>
-            </template>
+  <!-- 买履约 -->
+  <section>
+    <a-table :columns="getColums(BuyOrSell.buy)"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '190px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="handleBtn(btnList, record)"
+                 :record="record"
+                 class="btn-list-sticky"
+                 @click="openComponent" />
+      </template>
+      <!-- 履约类型 -->
+      <template #performancetype="{ record }">
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr) }}</a>
+      </template>
+      <template #activatemonth="{ text }">
+        <span>{{ handleNoneValue(text) }}</span>
+      </template>
+      <!-- 付款方式 -->
+      <template #paymenttype="{ record }">
+        <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
+      </template>
 
-            <!-- 付款方式 -->
-            <template #paymenttype="{ record }">
-                <a>{{ getPaymentTypeName(record.paymenttype) }}</a>
-            </template>
+      <!-- 履约状态 -->
+      <template #performancestatus="{ record }">
+        <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
+      </template>
 
-            <!-- 履约状态 -->
-            <template #performancestatus="{ record }">
-                <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
-            </template>
-
-            <!-- 当前步骤 -->
-            <template #curstepname="{ record }">
-                <a>{{ record.curstepname }}</a>
-            </template>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            :buyOrSell="BuyOrSell.buy"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+      <!-- 当前步骤 -->
+      <template #curstepname="{ record }">
+        <a>{{ record.curstepname }}</a>
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               :buyOrSell="BuyOrSell.buy"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
+import { BtnListType } from '@/common/components/btnList/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { BtnList, defineAsyncComponent, defineComponent, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { expandIcon } from '@/common/setup/table/clolumn';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { handleNoneValue } from '@/common/setup/table/tableQuote';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getColums } from '../setup';
+
 export default defineComponent({
     name: enumOrderComponents.performance_information_buy_performance,
     components: {
@@ -118,6 +117,8 @@ export default defineComponent({
             expandIcon,
             handleBtn,
             BuyOrSell,
+            getColums,
+            handleNoneValue,
         };
     },
 });

src/views/order/performance_information/components/performance_information_sell_performance/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 卖履约 -->
   <section>
-    <a-table :columns="columns"
+    <a-table :columns="getColums(BuyOrSell.sell)"
              class="srcollYTable expandLeftTable"
              :scroll="{ x: '100%', y: '190px' }"
              :pagination="false"
@@ -34,6 +34,9 @@
       <template #performancestatus="{ record }">
         <a>{{ getPerformanceStatusName(record.performancestatus) }}</a>
       </template>
+      <template #activatemonth="{ text }">
+        <span>{{ handleNoneValue(text) }}</span>
+      </template>
 
       <!-- 当前步骤 -->
       <template #curstepname="{ record }">
@@ -49,17 +52,19 @@
 </template>
 
 <script lang="ts">
+import { BtnListType } from '@/common/components/btnList/interface';
+import { BuyOrSell } from '@/common/constants/enumCommon';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { BtnList, defineAsyncComponent, defineComponent, ModalEnum, queryTableList } from '@/common/export/commonTable';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
-import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { expandIcon } from '@/common/setup/table/clolumn';
+import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import { getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/common/constants/enumsName';
+import { handleNoneValue } from '@/common/setup/table/tableQuote';
+import { QueryPerformancePlan } from '@/services/go/wrtrade';
+import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { getColums } from '../setup';
 
 export default defineComponent({
     name: enumOrderComponents.performance_information_sell_performance,
@@ -115,6 +120,8 @@ export default defineComponent({
             expandIcon,
             handleBtn,
             BuyOrSell,
+            getColums,
+            handleNoneValue,
         };
     },
 });

src/views/order/performance_information/components/setup.ts

@@ -0,0 +1,198 @@
+import { BuyOrSell } from "@/common/constants/enumCommon";
+
+export function getColums(type: BuyOrSell) {
+    const result = [
+        {
+            key: '0th',
+            dataIndex: 'deliverygoodsname',
+            title: '品种',
+            align: 'center',
+            slots: {
+                customRender: 'deliverygoodsname',
+            },
+            width: 120,
+        },
+        {
+            key: '1th',
+            dataIndex: 'wrstandardname',
+            title: '商品',
+            align: 'center',
+            slots: {
+                customRender: 'wrstandardname',
+            },
+            width: 120,
+        },
+        {
+            key: '2th',
+            dataIndex: 'performancetype',
+            title: '类型',
+            align: 'center',
+            slots: {
+                customRender: 'performancetype',
+            },
+            width: 120,
+        },
+        {
+            key: 'activatemonth',
+            dataIndex: 'activatemonth',
+            title: '交收月',
+            align: 'center',
+            slots: {
+                customRender: 'activatemonth',
+            },
+            width: 120,
+        },
+        {
+            key: '3th',
+            dataIndex: 'relatedorderid',
+            title: '关联单号',
+            align: 'center',
+            slots: {
+                customRender: 'relatedorderid',
+            },
+            width: 250,
+        },
+        {
+            key: '4th',
+            dataIndex: 'paymenttype',
+            title: '付款方式',
+            align: 'center',
+            slots: {
+                customRender: 'paymenttype',
+            },
+            width: 120,
+        },
+        {
+            key: '7th',
+            dataIndex: 'amount',
+            title: '总金额',
+            align: 'center',
+            slots: {
+                customRender: 'amount',
+            },
+            width: 120,
+        },
+        {
+            key: '8th',
+            dataIndex: 'buypaidamount',
+            title: '已付金额',
+            align: 'center',
+            slots: {
+                customRender: 'buypaidamount',
+            },
+            width: 120,
+        },
+        {
+            key: '9th',
+            dataIndex: 'overshortamount',
+            title: '溢短金额',
+            align: 'center',
+            slots: {
+                customRender: 'overshortamount',
+            },
+            width: 120,
+        },
+        {
+            key: 'overshortqty',
+            dataIndex: 'overshortqty',
+            title: '溢短数量',
+            align: 'center',
+            slots: {
+                customRender: 'overshortqty',
+            },
+            width: 120,
+        },
+        {
+            key: '10th',
+            dataIndex: 'sellusername',
+            title: '卖方',
+            align: 'center',
+            slots: {
+                customRender: 'sellusername',
+            },
+            width: 200,
+        },
+        {
+            key: '11th',
+            dataIndex: 'performancestatus',
+            title: '履约状态',
+            align: 'center',
+            slots: {
+                customRender: 'performancestatus',
+            },
+            width: 120,
+        },
+        {
+            key: '12th',
+            dataIndex: 'curstepname',
+            title: '当前步骤',
+            align: 'center',
+            slots: {
+                customRender: 'curstepname',
+            },
+            width: 120,
+        },
+        {
+            key: '13th',
+            dataIndex: 'createtime',
+            title: '开始时间',
+            align: 'center',
+            slots: {
+                customRender: 'createtime',
+            },
+            width: 250,
+        },
+    ];
+
+
+    if (type === BuyOrSell.buy) {
+        const buyArr = [
+            {
+                key: 'buyerfreezeamount',
+                dataIndex: 'buyerfreezeamount',
+                title: '买方冻结',
+                align: 'center',
+                slots: {
+                    customRender: 'buyerfreezeamount',
+                },
+                width: 120,
+            },
+            {
+                key: 'buyerfreezeamountremain',
+                dataIndex: 'buyerfreezeamountremain',
+                title: '买方剩余冻结',
+                align: 'center',
+                slots: {
+                    customRender: 'buyerfreezeamountremain',
+                },
+                width: 140,
+            },
+        ]
+
+    } else {
+        const sellArr = [
+            {
+                key: 'sellerfreezeamount',
+                dataIndex: 'sellerfreezeamount',
+                title: '卖方冻结',
+                align: 'center',
+                slots: {
+                    customRender: 'sellerfreezeamount',
+                },
+                width: 120,
+            },
+            {
+                key: 'sellerfreezeamountremain',
+                dataIndex: 'sellerfreezeamountremain',
+                title: '卖方剩余冻结',
+                align: 'center',
+                slots: {
+                    customRender: 'sellerfreezeamountremain',
+                },
+                width: 140,
+            },
+        ]
+        result.splice(8, 0, sellArr[0], sellArr[1])
+    }
+    return result
+}

swagger-to-ts/swagger.ts

@@ -1,8 +1,69 @@
 export interface Name{
-    bankid	:string;//银行ID
-bankname	:string;//银行名称
-clearbankno	:string;//清算系统银行编号
-orderindex	:number;//排序顺序
-status	:number;//状态 - number;
-//:正常 1:注销
+    activatemonth	:string;//履约激活月 无仓单的交易收月
+amount	:number;//履约金额(总金额)
+buyaccountid	:number;//买方账号
+buyerfreezeamount	:number;//履约冻结(买履约)
+buyerfreezeamountremain	:number;//履约冻结剩余(买履约)
+buyorsell	:number;//买卖方向 number;
+//-买 1-卖
+buypaidamount	:number;//买方已冻/已扣金额 (已付金额)
+buyusername	:string;//买方名字
+contractid	:number;//合同ID
+createtime	:string;//创建时间
+creatorid	:number;//创建人
+curstepdeadline	:string;//当前步骤到期时间
+curstepid	:string;//当前步骤ID
+curstepname	:string;//当前步骤名称
+deliverygoodscode	:string;//品种代码
+deliverygoodsid	:number;//品种ID
+deliverygoodsname	:string;//品种名称
+enumdicname	:string;//单位名称
+expressfee	:number;//运费
+expressfeeconfirmed	:number;//是否确认运费 - number;
+//:无 1:买方确认 2:卖方确认
+hasovershort	:number;//是否确认溢短 - number;
+//:没有 1:买方确认 2:卖方确认
+haswr	:number;//类型 number;
+//-仓单预售 1-仓单贸易
+marketid	:number;//市场ID
+middleaccountid	:number;//中间商资金账号ID
+middleuserid	:number;//中间商用户ID
+minivalue	:number;//现货商品最小变动值
+optioncompare	:string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+overshortamount	:number;//溢短金额
+overshortqty	:number;//溢短数量
+paymenttype	:number;//付款方式 - 1:冻结 2:扣款
+performanceplanid	:string;//履约计划ID(13number;
+//+yyMMddHHmmss+xxxx)
+performancestatus	:number;//履约状态 - 1:初始化 2:正常 3:处理错误 4:违约待处理 5:违约处理中 6:完成 7.违约已完成 8:释放冻结失败 9:超时待处理 1number;
+//:超时关闭
+performancetype	:number;//履约类型 - number;
+//:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 1number;
+//:法币C2C 11:报价系统 12:挂牌系统
+qty	:number;//履约数量
+relatedorderid	:string;//关联单号(履约类型的关联单号)
+remark	:string;//备注
+sellaccountid	:number;//卖方账号
+sellerfreezeamount	:number;//履约冻结(卖履约)
+sellerfreezeamountremain	:number;//履约冻结剩余(卖履约)
+sellreceivedamount	:number;//卖方已收金额
+sellusername	:string;//卖方名字
+shipremark	:string;//发货备注[物流单号]
+starttime	:string;//开始时间
+steptypeid	:number;//履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 1number;
+//:货款溢短 11:生成合同[中江] 12:运费 9number;
+//:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
+typename	:string;//履约类型 名称
+unpaidamount	:number;//剩余款(待支付金额)
+userid	:number;//用户id
+warehouseid	:number;//仓库ID
+warehousename	:string;//仓库名称
+wrfactortypeid	:string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+//位)+xxxxxx)
+wrfactortypename	:string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+wrstandardcode	:string;//现货商品代码
+wrstandardid	:number;//现货商品ID
+wrstandardname	:string;//商品名称
+wrtransferuserid	:number;//仓单受让用户
+wrtypename	:string;//商品
 }

swagger-to-ts/swagger.txt

@@ -1,16 +1,169 @@
 {
-    bankid	string
-银行ID
+    activatemonth	string
+履约激活月 无仓单的交易收月
 
-bankname	string
-银行名称
+amount	number
+履约金额(总金额)
 
-clearbankno	string
-清算系统银行编号
+buyaccountid	integer
+买方账号
 
-orderindex	integer
-排序顺序
+buyerfreezeamount	number
+履约冻结(买履约)
 
-status	integer
-状态 - 0:正常 1:注销
+buyerfreezeamountremain	number
+履约冻结剩余(买履约)
+
+buyorsell	integer
+买卖方向 0-买 1-卖
+
+buypaidamount	number
+买方已冻/已扣金额 (已付金额)
+
+buyusername	string
+买方名字
+
+contractid	integer
+合同ID
+
+createtime	string
+创建时间
+
+creatorid	integer
+创建人
+
+curstepdeadline	string
+当前步骤到期时间
+
+curstepid	string
+当前步骤ID
+
+curstepname	string
+当前步骤名称
+
+deliverygoodscode	string
+品种代码
+
+deliverygoodsid	integer
+品种ID
+
+deliverygoodsname	string
+品种名称
+
+enumdicname	string
+单位名称
+
+expressfee	number
+运费
+
+expressfeeconfirmed	integer
+是否确认运费 - 0:无 1:买方确认 2:卖方确认
+
+hasovershort	integer
+是否确认溢短 - 0:没有 1:买方确认 2:卖方确认
+
+haswr	integer
+类型 0-仓单预售 1-仓单贸易
+
+marketid	integer
+市场ID
+
+middleaccountid	integer
+中间商资金账号ID
+
+middleuserid	integer
+中间商用户ID
+
+minivalue	integer
+现货商品最小变动值
+
+optioncompare	string
+选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+
+overshortamount	number
+溢短金额
+
+overshortqty	number
+溢短数量
+
+paymenttype	integer
+付款方式 - 1:冻结 2:扣款
+
+performanceplanid	string
+履约计划ID(130+yyMMddHHmmss+xxxx)
+
+performancestatus	integer
+履约状态 - 1:初始化 2:正常 3:处理错误 4:违约待处理 5:违约处理中 6:完成 7.违约已完成 8:释放冻结失败 9:超时待处理 10:超时关闭
+
+performancetype	integer
+履约类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 10:法币C2C 11:报价系统 12:挂牌系统
+
+qty	number
+履约数量
+
+relatedorderid	string
+关联单号(履约类型的关联单号)
+
+remark	string
+备注
+
+sellaccountid	integer
+卖方账号
+
+sellerfreezeamount	number
+履约冻结(卖履约)
+
+sellerfreezeamountremain	number
+履约冻结剩余(卖履约)
+
+sellreceivedamount	number
+卖方已收金额
+
+sellusername	string
+卖方名字
+
+shipremark	string
+发货备注[物流单号]
+
+starttime	string
+开始时间
+
+steptypeid	integer
+履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 10:货款溢短 11:生成合同[中江] 12:运费 90:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
+
+typename	string
+履约类型 名称
+
+unpaidamount	number
+剩余款(待支付金额)
+
+userid*	integer
+用户id
+
+warehouseid	integer
+仓库ID
+
+warehousename	string
+仓库名称
+
+wrfactortypeid	string
+仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
+
+wrfactortypename	string
+仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+
+wrstandardcode	string
+现货商品代码
+
+wrstandardid	integer
+现货商品ID
+
+wrstandardname	string
+商品名称
+
+wrtransferuserid	integer
+仓单受让用户
+
+wrtypename	string
+商品
 }