Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/services/go/ermcp/qhj/index.ts

@@ -8,13 +8,14 @@ import {
     QhjCustomer,
     QhjParentAreaList,
     QhjPickGoods,
+    QhjPayOrder,
     QhjReckonPriceLog,
     QhjRStrategy,
     QhjRSTriggerLog,
     QhjTradeGoodsPickup,
     QueryAccountInOutApplyReq,
     QueryContractReq,
-    QueryCustomerInfoReq,
+    QueryCustomerInfoReq, QueryPayOrderReq,
     QueryReckonPriceLogReq
 } from "@/services/go/ermcp/qhj/interface";
 
@@ -94,7 +95,7 @@ export function queryContract(req: QueryContractReq): Promise<QhjContract[]> {
  * 查询客户资料 /Qhj/QueryCustomerInfo
  * @param req
  */
-export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustomer> {
+export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustomer[]> {
     const userid = getUsrId();
     req.userid = userid;
     console.log(req);
@@ -129,5 +130,15 @@ export function queryPickGoods(status?: 1 | 2 | 3): Promise<QhjPickGoods[]> {
     });
 }
 
+/**
+ * -- 铂金宝 - 查询待付款单据
+ * 查询客户资料 /Qhj/QueryPayOrder
+ * @param req
+ */
+export function queryPayOrder(req: QueryPayOrderReq): Promise<QhjPayOrder[]> {
+    return commonSearch_go('/Qhj/QueryPayOrder', req).catch((err) => {
+        throw new Error(`查询待付款单据: ${err.message}`);
+    });
+}
 
 

src/services/go/ermcp/qhj/interface.ts

@@ -278,7 +278,7 @@ export interface QhjContract {
  * 查询客户资料
  */
 export interface QueryCustomerInfoReq {
-    userid: number  //          用户ID
+    userid?: number  //          用户ID
     querytype: number //        查询类型 1:未提交(网上开户表) 2:待审核(网上开户表) 3:正常 4:停用
     userinfotype?: number//      客户类型 1-个人 2-企业
     customername?: string//      客户名称(模糊匹配)
@@ -348,4 +348,42 @@ export interface QhjPickGoods {
     preparedays: number;//备货期(天)
     remark: string;//备注
     updatetime: string;//更新时间
-}
+}
+/**
+ * 查询待付款单据
+ */
+export interface QueryPayOrderReq {
+    accountid: number  // 资金账号id
+    tradeid?: number   // 成交单号
+    payflag?: number    // 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+}
+
+/**
+ * 查询待付款单据返回
+ */
+export interface QhjPayOrder{
+    buyaccountid	:number;//买方账号ID[报价币种]
+    buyorderid	:string;//买方委托单号
+    createtime	:string;//创建时间
+    goodscode	:string;//商品代码
+    goodsid	:number;//商品ID
+    goodsname	:string;//商品名称
+    marketid	:number;//市场ID
+    offamount	:number;//优惠金额
+    operatetype	:number;//买委托操作类型 - 1:正常下单 16:融资买入
+    payamount	:number;//支付金额=TradeAmount + TradeCharge
+    payflag	:number;//付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+    paylimitedtime	:string;//支付期限
+    paytime	:string;//付款时间
+    sellaccountid	:number;//卖方账号ID[报价币种]
+    sellorderid	:string;//卖方委托单号
+    tradeamount	:number;//成交金额(优惠后金额)
+    tradecharge	:number;//成交手续费(买方)
+    tradedate	:string;//交易日(yyyyMMdd)
+    tradeid	:string;//成交单号(1number;
+//1+Unix秒时间戳(1number;
+//位)+2位(MarketServiceID)+xxxx)
+    tradeprice	:number;//成交价格
+    tradeqty	:number;//成交数量
+}
+

src/views/platinum/platinum_customer_info/compoments/add/index.vue

@@ -344,10 +344,10 @@ export default defineComponent({
                     logincode: param.logincode,
                     loginpwd: param.loginpwd,
                     username: param.username, // 必填
-                    userid: 1, // 写死 必填
+                    userid: getUserId(), // 写死 必填
                     userinfotype: Number(param.userinfotype),
                     // 以上必填
-                    cardtype: param.cardtype as number, // 证件类型
+                    cardtype: (param.cardtype as number) !== undefined ? (param.cardtype as number) : 0, // 证件类型
                     cardnum: param.cardnum, // 证件号码
                     nickname: param.nickname, // 昵称
                     remark: param.remark, // 备注
@@ -366,6 +366,7 @@ export default defineComponent({
                     email: param.email, // email
                     proxystatementurl: isPersonal() ? '' : getAttachmentImg(), // 营业执照
                 };
+                debugger
                 requestResultLoadingAndInfo(addCustomerInfoOperate, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['新增客户资料成功', '新增客户资料失败:']).then(() => {
                     cancel();
                     context.emit('refresh');

src/views/platinum/platinum_customer_info/compoments/check/index.vue

@@ -30,12 +30,13 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
+import {AuditWskhUserInfoReq, UserInfoCheckMangeReq} from '@/services/proto/accountinfo/interface';
 import { getUserId } from '@/services/bus/account';
 import { Modal } from 'ant-design-vue';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { userInfoCheck } from '@/services/proto/accountinfo';
+import {auditWskhUserInfo, userInfoCheck} from '@/services/proto/accountinfo';
 import Detail from '../common-detail/index.vue';
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 export default defineComponent({
     name: 'custom_info_btn_check',
@@ -57,13 +58,13 @@ export default defineComponent({
                 okText: '确认通过',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: UserInfoCheckMangeReq = {
-                        audituserid: getUserId(),
-                        userid: props.selectedRow.userid,
-                        auditflag: 1,
-                        remark: '',
+                    let reqParam: AuditWskhUserInfoReq = {
+                        UserID: props.selectedRow.userid,
+                        UserState: 4,
+                        AuditedBy: Number(getLongTypeLoginID()),
                     };
-                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
+                    debugger
+                    requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });
@@ -79,13 +80,12 @@ export default defineComponent({
                 okText: '审核拒绝',
                 cancelText: '取消',
                 onOk() {
-                    let reqParam: UserInfoCheckMangeReq = {
-                        audituserid: getUserId(),
-                        userid: props.selectedRow.userid,
-                        auditflag: 2,
-                        remark: '',
+                    let reqParam: AuditWskhUserInfoReq = {
+                        UserID: props.selectedRow.userid,
+                        UserState: 5,
+                        AuditedBy: Number(getLongTypeLoginID()),
                     };
-                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
+                    requestResultLoadingAndInfo(auditWskhUserInfo, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
                         cancel();
                         context.emit('refresh');
                     });

src/views/platinum/platinum_customer_info/list/checkpending/index.vue

@@ -58,10 +58,10 @@ export default defineComponent({
         // 表格操作按钮列表
         const { commonBtn, forDataBtn } = getBtnList('custom_info_checkpending', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(2);
+        const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable();
+            queryTable(2);
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -41,6 +41,7 @@ import { queryTableList, QueryCustomInfoType } from '../index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 export default defineComponent({
     name: 'custom-normal',
     components: {
@@ -53,7 +54,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QhjCustomer>({});
         // 表格操作按钮列表
         const { commonBtn, forDataBtn } = getBtnList('platinum_custom_info_normal', true);
         // 表格列表数据

src/views/platinum/platinum_customer_info/list/setup.ts

@@ -2,6 +2,7 @@ import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { queryCustomerInfo } from '@/services/go/ermcp/qhj';
 import { ref } from 'vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 /**
  * 获取表格列表数据
@@ -12,7 +13,7 @@ export function queryTableList() {
     // 加载状态
     const loading = ref<boolean>(false);
     // 表格数据
-    const tableList = ref<QueryCustomInfoType[]>([]);
+    const tableList = ref<QhjCustomer[]>([]);
     function queryTable(querytype: 1 | 2 | 3 | 4) {
         const param = { querytype }
         queryResultLoadingAndInfo(queryCustomerInfo, loading, param).then(res => {

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -42,6 +42,7 @@ import { queryTableList, QueryCustomInfoType } from '../index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-normal',
@@ -55,7 +56,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QhjCustomer>({});
         // 表格操作按钮列表
         const { commonBtn, forDataBtn } = getBtnList('platinum_customer_info_stop', true);
         // 表格列表数据

src/views/platinum/platinum_customer_info/list/unsubmit/index.vue

@@ -18,8 +18,11 @@
           <BtnList :btnList="secondeBtn" />
         </template>
         <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+          <a>{{ text === 2 ? '企业' : '个人' }}</a>
         </template>
+          <template #customername="{ record }">
+              <a>{{ record.userinfotype === 2 ? record.customername : record.username }}</a>
+          </template>
         <template #status="{ text }">
           <a>{{ getStatusName(text) }}</a>
         </template>
@@ -41,6 +44,7 @@ import { queryTableList, QueryCustomInfoType } from '../index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
+import {QhjCustomer} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom_info_unsubmit',
@@ -54,7 +58,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QhjCustomer>({});
         // 表格操作按钮列表
         const [firstBtn, secondeBtn] = _getBtnList('platinum_customer_info_unsubmit', true).value;
         // 表格列表数据