修改提货查询

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

@@ -16,8 +16,7 @@ import {
     QueryCustomerInfoReq,
     QueryReckonPriceLogReq,
     QueryRStrategyReq,
-    QueryRSTriggerLogReq,
-    QueryTradeGoodsPickupReq
+    QueryRSTriggerLogReq
 } from "@/services/go/ermcp/qhj/interface";
 
 /**
@@ -25,8 +24,9 @@ import {
  * 查询提货 /Qhj/QueryTradeGoodsPickup
  * @constructor
  */
-export function queryTradeGoodsPickup(req: QueryTradeGoodsPickupReq): Promise<QhjTradeGoodsPickup[]> {
-    return commonSearch_go('/Qhj/QueryTradeGoodsPickup', req).catch((err) => {
+export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
+    const userid = getUsrId()
+    return commonSearch_go('/Qhj/QueryTradeGoodsPickup', { userid }).catch((err) => {
         throw new Error(`查询提货: ${err.message}`);
     });
 }

src/views/platinum/platinum_pick_query/list/tab/compoments/common-detail/index.vue

@@ -7,71 +7,35 @@
 
 <script lang="ts">
 import { defineComponent, PropType, watchEffect } from 'vue';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue } from '@/common/methods';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import { Des, handleDesList } from '@/common/components/commonDes';
-import { handlePreviewImg } from '@/common/setup/upload';
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
 
 export default defineComponent({
     name: 'custom-detail-desc',
     components: { Des },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },
     setup(props) {
-        function isPersonal() {
-            return props.selectedRow.userinfotype === '1';
-        }
         const { desList, getDesList } = handleDesList();
-        // 预览附件
-        const { previewVisible, previewImage, cancelImg, previewImg, getImgName } = handlePreviewImg();
-
         watchEffect(() => {
-            if (props.selectedRow.customername) {
+            if (props.selectedRow.takeorderid) {
                 const data = props.selectedRow;
                 // 个人
-                const person = [
-                    { label: '客户类型', value: '个人' },
-                    { label: '姓名', value: data.customername },
-                    { label: '身份证号码', value: formatValue(data.cardnum) },
-                    { label: '手机号码', value: formatValue(data.mobile) },
-                    { label: '身份证正面照', value: formatValue(getImgName(data.cardfrontphotourl)), className: 'blue' },
-                    { label: '身份证反面照', value: formatValue(getImgName(data.cardbackphotourl)), className: 'blue' },
-                    { label: '邮箱', value: formatValue(data.email) },
-                    { label: '联系电话', value: formatValue(data.telphone) },
-                    { label: '通讯地址', value: formatValue(data.address) },
-                    { label: '备注', value: formatValue(data.remark) },
-                ];
-                // 企业
-                const company = [
-                    { label: '客户类型', value: '企业' },
-                    { label: '企业名称', value: data.customername },
-                    { label: '企业简称', value: formatValue(data.nickname) },
-                    { label: '证件类型', value: getCardTypeEnumItemName(data.cardtype) },
-                    { label: '法定代表人', value: formatValue(data.legalpersonname) },
-                    { label: '证件号码', value: formatValue(data.cardnum) },
-                    { label: '纳税人识别号', value: formatValue(data.taxpayernum) },
-                    { label: '营业执照', value: formatValue(getImgName(data.attachment1)), className: 'blue' },
-                    { label: '联系人', value: formatValue(data.contactname) },
-                    { label: '联系人手机号', value: formatValue(data.mobile) },
-                    { label: '联系电话', value: formatValue(data.telphone) },
-                    { label: '状态', value: getStatusName(data.status), className: 'green' },
-                    { label: '通讯地址', value: formatValue(data.address) },
-                    { label: '备注', value: formatValue(data.remark) },
+                const list = [
+                    { label: '账号', value: formatValue(data.accountid) },
+                    { label: '名称', value: formatValue(data.username) },
+                    // { label: '账户类型', value: data.userinfotype === 1 '个人' : '企业'},
                 ];
-                getDesList(isPersonal() ? person : company);
+                getDesList(list);
             }
         });
         return {
             desList,
-            previewVisible,
-            previewImage,
-            cancelImg,
         };
     },
 });

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

@@ -39,13 +39,12 @@ export default defineComponent({
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_pick_query_tab', true).value;
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList('in');
+        const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_warehouse', ['warehousetype', 'warehousename', 'address']);
-            // registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_qhj_pickup_query', ['warehousetype', 'warehousename', 'address']);
         });
 
         // 查询
@@ -74,6 +73,5 @@ export default defineComponent({
 
 <style lang="less">
 .platinum_recharge_review_tab {
-
 }
 </style>;

src/views/platinum/platinum_pick_query/list/tab/setup.ts

@@ -1,51 +1,18 @@
-import { QueryWareHouse } from '@/services/go/ermcp/warehouse-info/index';
-import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
-import { message } from 'ant-design-vue';
+import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { queryTradeGoodsPickup } from '@/services/go/ermcp/qhj';
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
 import { ref } from 'vue';
 
-
-
-/**
- * 获取表格列表数据
- * @param type 
- * @returns 
- */
-export function queryTableList(type: string) {
+export function queryTableList() {
     // 加载状态
     const loading = ref<boolean>(false);
     // 表格数据
-    const tableList = ref<ErmcpWareHouseInfo[]>([]);
+    const tableList = ref<QhjTradeGoodsPickup[]>([]);
     function queryTable() {
-        QueryWareHouse('1')
-            .then((res) => {
-                tableList.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
-                });
-                loading.value = false;
-                console.log('查询列表', tableList);
+        queryResultLoadingAndInfo(queryTradeGoodsPickup, loading)
+            .then(res => {
+                tableList.value = res
             })
-            .catch((err) => {
-                message.error(err);
-                loading.value = false;
-            });
     }
     return { loading, tableList, queryTable }
-}
-
-// export function queryTableList(type: 'in' | 'out') {
-//     // 加载状态
-//     const loading = ref<boolean>(false);
-//     // 表格数据
-//     const tableList = ref<QhjAccountOutInApply[]>([]);
-//     function queryTable() {
-//         queryResultLoadingAndInfo(queryAccountInOutApply, loading)
-//             .then(res => {
-//                 //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-//                 const arr = type === 'in' ? [1, 3, 5, 7] : [2, 4, 6, 8]
-//                 tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
-//                     return { ...e, key: String(i) };
-//                 });
-//             })
-//     }
-//     return { loading, tableList, queryTable }
-// }
+}