Merge remote-tracking branch 'origin/master'

src/common/setup/table/clolumn.ts

@@ -32,7 +32,7 @@ export function getTableColumns() {
         list.forEach((e, i) => {
             const { columnfield, columntitle, columnwidth, aligntype, formatterstring } = e;
             const item: ColumnType = {
-                key: String(i),
+                key: String(i + 'th'),
                 dataIndex: columnfield, // 表格数据对应的key
                 title: columntitle,
                 align: aligntype === 1 ? 'center' : aligntype === 2 ? 'left' : 'right',

src/common/setup/table/event.ts

@@ -15,13 +15,7 @@ export function getTableEvent<T>(param: TableEventCB) {
         return {
             onClick: () => {  // 表格点击
                 selectedRow.value = record
-                const value = expandedRowKeys.value;
-                if (value.length) {
-                    const key = value[0];
-                    expandedRowKeys.value = key === index.toString() ? [] : [`${index}`];
-                } else {
-                    expandedRowKeys.value = [`${index}`]
-                }
+                expandedRowKeys.value = (record as any).key
                 param.clickCB && param.clickCB()
             },
             // onDblclick: () => { // 双击

src/services/dataCenter/index.ts

@@ -22,7 +22,8 @@ const needClearSourceData: NeedClearSourceDataType = {
     WPFInfo: new WPFInfo(),
 
     queryClientFixedADConfigs: [],
-    checkTokenTimeDiff: Math.floor(Math.random() * 6 + 5) * 60 * 1000,
+    // checkTokenTimeDiff: Math.floor(Math.random() * 6 + 5) * 60 * 1000,
+    checkTokenTimeDiff: 1 * 60 * 1000,
     accountList: [],
     areaRoleMarketList: [],
     taAccountMarketList: [],

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

@@ -152,7 +152,7 @@ export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
  */
 export function queryPickGoods(status?: string): Promise<QhjPickGoods[]> {
     const param = status ? { status } : {}
-    return commonSearch_go('/Qhj/QueryPickGoods', param).catch((err) => {
+    return commonSearch_go('/QhjMgr/QueryPickGoods', param).catch((err) => {
         throw new Error(`查询提货商品: ${err}`);
     });
 }

src/views/platinum/platinum_customer_info/compoments/common-detail/index.vue

@@ -41,10 +41,10 @@ export default defineComponent({
         const { previewVisible, previewImage, cancelImg, previewImg, getImgName } = handlePreviewImg();
         //
         function imgClick({ label }: DescriptionsList) {
-            const { attachment1, cardfrontphotourl, cardbackphotourl } = props.selectedRow;
+            const { proxystatementurl, cardfrontphotourl, cardbackphotourl } = props.selectedRow;
             switch (label) {
                 case '营业执照':
-                    previewImg(attachment1);
+                    previewImg(proxystatementurl);
                     break;
                 case '身份证正面照':
                     previewImg(cardfrontphotourl);

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

@@ -8,13 +8,14 @@ export function handleSearch(querytype: 1 | 2 | 3 | 4, queryTable: Function) {
     function search(value: any) {
         const { includesub, name, nickname, userid, userinfotype } = value;
         const param: QueryCustomerInfoReq = {
-            includesub,     // 是否包含子级 1-包含
+            // includesub,     // 是否包含子级 1-包含
             querytype,  // 查询类型 1:未提交(网上开户表) 2:待审核(网上开户表) 3:正常 4:停用
             customername: name[0],  // 客户名称(模糊匹配)
             nickname: nickname[0],     // 昵称(模糊匹配)
             userinfotype: userinfotype[0] ? userinfotype[0] : 0,
             userid: userid[0] ? userid[0] : getUserId()
         };
+        (includesub !== undefined) && (param.includesub = includesub)
         cache = param
         queryTable(queryCustomerInfo, param);
     }

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

@@ -0,0 +1,79 @@
+<template>
+  <!-- 过滤客户资料表格 -->
+  <div class="filterTable">
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList">
+    </FilterOption>
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent } from 'vue';
+import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+import { ref } from 'vue';
+import { queryTableList } from '@/common/setup/table/list';
+import { initData } from '@/common/methods';
+import { queryParentAreaList } from '@/services/go/ermcp/qhj';
+import { QhjParentAreaList } from '@/services/go/ermcp/qhj/interface';
+
+export default defineComponent({
+    name: 'filter-custom-unsubmit',
+    components: { FilterOption },
+    setup(props, context) {
+        const select = ref<SelectList[]>([
+            {
+                value: undefined,
+                key: 'userinfotype',
+                placeholder: '全部客户类型',
+                list: [
+                    { value: 1, lable: '个人' },
+                    { value: 2, lable: '企业' },
+                ],
+            },
+            {
+                value: undefined,
+                key: 'userid',
+                placeholder: '请选择子机构',
+                list: [],
+            },
+        ]);
+        const input: InputList[] = [
+            { value: '', placeholder: '模糊搜索客户简称', key: 'nickname' },
+            { value: '', placeholder: '模糊搜索客户名称', key: 'name' },
+            // { value: '', placeholder: '模糊搜索手机号码', key: 'phone' },
+        ];
+        // 是否包含子级 1-包含
+        const includesub = ref<boolean>(false);
+        const param = {
+            search(result: any) {
+                result.includesub = includesub.value ? 1 : 0;
+            },
+            reset() {
+                includesub.value = false;
+            },
+        };
+        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, param);
+        const { queryTable } = queryTableList<QhjParentAreaList>();
+        initData(() => {
+            queryTable(queryParentAreaList).then((res) => {
+                select.value[1].list = res.map((e) => {
+                    return { value: e.userid, lable: e.accountname };
+                });
+            });
+        });
+
+        return {
+            selectList,
+            includesub,
+            inputList,
+            fixedBtnList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+</style>;

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

@@ -39,7 +39,7 @@
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, queryTableList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 
-import { filterCustomTable } from '../../compoments';
+import filterCustomTable from './compoments/filterTable/index.vue';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';

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

@@ -74,132 +74,51 @@ export default defineComponent({
                 key: 'remainamount',
             },
         ];
+        function getStatus(type: number): string {
+            let result = '--';
+            switch (type) {
+                case 1:
+                    result = '待确认';
+                    break;
+                case 2:
+                    result = '已确认';
+                    break;
+                case 3:
+                    result = '确认拒绝';
+                    break;
+                case 4:
+                    result = '已支付保证金';
+                    break;
+                case 5:
+                    result = '已激活';
+                    break;
+                case 6:
+                    result = '已违约';
+                    break;
+                case 7:
+                    result = '到期结束';
+                    break;
+                case 8:
+                    result = '延期结束';
+                    break;
+                case 9:
+                    result = '违约结束';
+                    break;
+                case 10:
+                    result = '已注销';
+                    break;
+                case 11:
+                    result = '已关闭';
+                    break;
+                case 99:
+                    result = '未提交';
+                    break;
+            }
+            return result;
+        }
         watchEffect(() => {
             if (visible.value) {
                 const data = props.selectedRow;
-                [
-                    {
-                        key: '0',
-                        dataIndex: 'logincode',
-                        title: '账号',
-                        align: 'center',
-                        slots: {
-                            customRender: 'logincode',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '1',
-                        dataIndex: 'username',
-                        title: '名称',
-                        align: 'center',
-                        slots: {
-                            customRender: 'username',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '2',
-                        dataIndex: 'regularlymodevalue',
-                        title: '账户类型',
-                        align: 'center',
-                        slots: {
-                            customRender: 'regularlymodevalue',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '3',
-                        dataIndex: 'goodsname',
-                        title: '商品',
-                        align: 'center',
-                        slots: {
-                            customRender: 'goodsname',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '4',
-                        dataIndex: 'tradeprice',
-                        title: '价格',
-                        align: 'center',
-                        slots: {
-                            customRender: 'tradeprice',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '5',
-                        dataIndex: 'wrqty',
-                        title: '数量',
-                        align: 'center',
-                        slots: {
-                            customRender: 'wrqty',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '6',
-                        dataIndex: 'lenderamount',
-                        title: '金额',
-                        align: 'center',
-                        slots: {
-                            customRender: 'lenderamount',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '7',
-                        dataIndex: 'payamount',
-                        title: '已付款',
-                        align: 'center',
-                        slots: {
-                            customRender: 'payamount',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '8',
-                        dataIndex: 'remainamount',
-                        title: '融资额',
-                        align: 'center',
-                        slots: {
-                            customRender: 'remainamount',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '9',
-                        dataIndex: 'totalinterest',
-                        title: '利息',
-                        align: 'center',
-                        slots: {
-                            customRender: 'totalinterest',
-                        },
-                        width: 120,
-                    },
-                    {
-                        key: '10',
-                        dataIndex: 'contractconfirmtime',
-                        title: '融资时间',
-                        align: 'center',
-                        slots: {
-                            customRender: 'contractconfirmtime',
-                        },
-                        width: 120,
-                        filteredValue: null,
-                    },
-                    {
-                        key: '11',
-                        dataIndex: 'scfcontracttype',
-                        title: '状态',
-                        align: 'center',
-                        slots: {
-                            customRender: 'scfcontracttype',
-                        },
-                        width: 120,
-                    },
-                ];
                 // 个人
                 const person = [
                     { label: '账号', value: formatValue(data.logincode) },
@@ -212,8 +131,9 @@ export default defineComponent({
                     { label: '已付款', value: formatValue(data.payamount) },
                     { label: '融资额', value: formatValue(data.totalinterest) },
                     { label: '融资时间', value: formatValue(data.contractconfirmtime) },
-                    { label: '状 态', value: formatValue(data.scfcontracttype), className: 'red' },
+                    { label: '状 态', value: getStatus(data.scfcontracttype), className: 'red' },
                 ];
+
                 getDesList(person);
                 const param: QueryContractLogReq = {
                     scfcontractid: data.scfcontractid,

src/views/platinum/platinum_pick_query/compoments/filter/index.vue

@@ -55,7 +55,7 @@ export default defineComponent({
 
         const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, getFilterRangeTime(date));
         initData(() => {
-            queryPickGoods().then((res) => {
+            queryPickGoods('1').then((res) => {
                 select.value[0].list = res.map((e) => {
                     return { value: e.pickupgoodsid, lable: e.pickupgoodsname };
                 });

src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/common-detail/index.vue

@@ -44,7 +44,7 @@ export default defineComponent({
             if (props.selectedRow.exchticket) {
                 const data = props.selectedRow;
                 const list = [
-                    { label: '账号', value: formatValue(data.accountcode) },
+                    { label: '账号', value: formatValue(data.logincode) },
                     { label: '名称', value: formatValue(data.accountname) },
                     { label: '账户类型', value: data.userinfotype === 1 ? '个人' : '企业' },
                     { label: '充值金额', value: formatValue(data.amount) },