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

src/goServiceAPI/commonService/index.ts

@@ -102,6 +102,7 @@ export function QueryTableDefine(): Promise<type.TableDefineRsp[]> {
     return commonSearch_go('/Common/QueryTableDefine', param)
         .then((res) => {
             console.log('查询交易端列表头信息', res);
+            APP.set('tableHead', res)
             return res;
         })
         .catch((err: Error) => {

src/goServiceAPI/ermcp/purchase/index.ts

@@ -1 +1,20 @@
-/** ================================= 采购 ================================**/
+import {commonSearch_go} from "@/goServiceAPI";
+import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
+
+/** ================================= 采购 ================================**/
+/**
+ * 查询采购信息(这个接口和销售是同一个接口) /Ermcp3/QuerySpotContractBS
+ * @param req.areauserid 所属机构ID (必填)
+ * @param req.contracttype 合同类型 1-采购, -1-销售 (必填)
+ * @param req.querytype 查询类型 1-全部 2-待点价 3-履约结算 4-已完成 (必填)
+ * @param req.userid 用户id
+ * @param req.usertype 用户类型 2-机构 7-企业成员
+ * @param req.contractid 合同ID(SpotContractId)
+ * @constructor
+ */
+export function QueryPurchase( req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', {req})
+        .catch(err => {
+            throw new Error(`查询采购信息: ${err.message}`);
+        })
+}

src/goServiceAPI/ermcp/purchase/interface.ts

@@ -0,0 +1,71 @@
+/**
+ * 查询合同请求
+ */
+export interface SellBuyContractReq{
+    areauserid: number  //  所属机构ID
+    contracttype: number // 合同类型 1-采购, -1-销售
+    querytype: number // 查询类型 1-全部 2-待点价 3-履约结算 4-已完成
+    userid?: number // 用户ID
+    usertype?: number // 用户类型 2-机构 7-企业成员
+    contractid?: string // 合同ID(SpotContractId)
+}
+
+/**
+ * 查询合同返回
+ */
+export interface Ermcp3SellBuyContract{
+    accountname	:string;//账户名称
+    attachment	:string;//附件
+    audittime	:string;//审核时间
+    brandname	:string;//品牌名称
+    contracctstatus	:number;//合同状态- number;
+//:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    contractmargin	:number;//合同保证金
+    contractno	:string;//合同编号
+    contracttype	:number;//合同类型 1-采购, -1-销售
+    convertfactor	:number;//标仓系数(品类)
+    createtime	:string;//创建时间
+    daikaiamount	:number;//应收(开)票额
+    deliveryenddate	:string;//交割结束日
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货商品ID
+    deliverygoodsname	:string;//现货品种名称
+    deliverystartdate	:string;//交割开始日
+    enddate	:string;//点价结束日
+    enumdicname	:string;//单位名称
+    goodscode	:string;//点价商品代码
+    goodsid	:number;//点价商品ID
+    goodsname	:string;//点价商品名称
+    invoiceamount	:number;//已开票额
+    loanamount	:number;//贷款总额=已定价额+调整金额
+    margin	:number;//保证金
+    nickname	:string;//账户昵称
+    payamount	:number;//已收付额(收款或付款)
+    preinvoiceamount	:number;//预收(开)票额
+    prepayamount	:number;//预收付额
+    price	:number;//价格
+    pricedamount	:number;//已定价额
+    pricedavg	:number;//已点均价
+    pricedqty	:number;//已定价量
+    pricemove	:number;//升贴水
+    pricetype	:number;//定价类型 - 1:一口价 2:点价 3:暂定价
+    producttype	:number;//产品类型 - 1:标准仓单 2:等标 3:非标
+    qty	:number;//合同量
+    reckonadjustamount	:number;//调整金额
+    reckonedamount	:number;//实际已收付额(已确定额,已收付总额-已退款总额)
+    reckonotheramount	:number;//其它费用
+    reckonrealqty	:number;//已确定量
+    remark	:string;//备注
+    spotcontractid	:string;//合同ID
+    spotgoodsbrandid	:number;//现货品牌ID(DGFactoryItem表的ID)
+    spotgoodsdesc	:string;//商品型号(商品规格)
+    startdate	:string;//点价开始日
+    totalamount	:number;//合计总额
+    unpayamount	:number;//应收付款额(应支付或应收款)
+    unpricedqty	:number;//未定价量
+    unsureqty	:number;//未确定量
+    userid	:number;//机构ID
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类ID
+    wrstandardname	:string;//品类名称
+}

src/goServiceAPI/ermcp/sell/index.ts

@@ -1 +1,20 @@
-/** ================================= 销售 ================================**/
+/** ================================= 销售 ================================**/
+import {Ermcp3SellBuyContract, SellBuyContractReq} from "@/goServiceAPI/ermcp/purchase/interface";
+import {commonSearch_go} from "@/goServiceAPI";
+
+/**
+ * 查询销售信息(这个接口和采购是同一个接口) /Ermcp3/QuerySpotContractBS
+ * @param req.areauserid 所属机构ID (必填)
+ * @param req.contracttype 合同类型 1-采购, -1-销售 (必填)
+ * @param req.querytype 查询类型 1-全部 2-待点价 3-履约结算 4-已完成 (必填)
+ * @param req.userid 用户id
+ * @param req.usertype 用户类型 2-机构 7-企业成员
+ * @param req.contractid 合同ID(SpotContractId)
+ * @constructor
+ */
+export function QueryWareHouse(req : SellBuyContractReq) : Promise<Ermcp3SellBuyContract[]>{
+    return commonSearch_go('/Ermcp3/QuerySpotContractBS', {req})
+        .catch(err => {
+            throw new Error(`查询销售信息: ${err.message}`);
+        })
+}

src/services/bus/table.ts

@@ -0,0 +1,15 @@
+import { Column, TableDefineRsp } from '@/goServiceAPI/commonService/interface';
+import APP from '@/services';
+
+interface TableKey {
+    table_pcweb_delivery: string; // 现货合同
+    table_pcweb_userinfo: string; // 客户资料
+}
+
+/**
+ * 获取动态表头
+ */
+export function getTableHead(tableKey: keyof TableKey): Column[] {
+    const result = APP.get('tableHead').find((e: TableDefineRsp) => e.tablekey === tableKey);
+    return result ? result.columns : []
+}

src/views/information/custom/compoments/filterTable/index.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, ref, SetupContext } from 'vue';
 
 // 处理 客户类型
 function handleUserInfoType() {
@@ -41,16 +41,22 @@ function handleUserInfoType() {
 }
 
 // 搜索
-function handleSearch() {
+function handleSearch(context: SetupContext) {
     const nickname = ref<string>('');
     const name = ref<string>('');
     const phone = ref<string>('');
-    function search() {}
+
+    function search() {
+        const result = { nickname: [nickname.value], name: [name.value], mobile: [phone.value] };
+        context.emit('search', result);
+    }
     function reset() {
         nickname.value = '';
         name.value = '';
         phone.value = '';
+        search();
     }
+
     return { nickname, name, phone, search, reset };
 }
 
@@ -63,7 +69,7 @@ export default defineComponent({
         }
         return {
             ...handleUserInfoType(),
-            ...handleSearch(),
+            ...handleSearch(context),
             add,
         };
     },

src/views/information/custom/list/normal-use/index.vue

@@ -1,93 +1,123 @@
 <template>
   <!-- 客户信息: 正常 -->
   <div class="custom-normal">
-    <filterCustomTable @add="add" />
-    <!-- <a-table :columns="columns"
-             :data-source="data"
-             @change="handleChange" /> -->
+    <filterCustomTable @add="add"
+                       @search="search" />
+    <a-table :columns="columns"
+             :pagination="false"
+             rowKey="key"
+             :data-source="customList" />
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue';
-import { QueryTableDefine } from '@/goServiceAPI/commonService/index';
 
 import { initData } from '@/setup/methods/index';
 import { QueryCustomInfo } from '@/goServiceAPI/ermcp/customInfo/index';
 import { QueryCustomInfoType } from '@/goServiceAPI/ermcp/customInfo/interface';
 import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
+import { getTableHead } from '@/services/bus/table';
+import { TableState, TableStateFilters } from 'ant-design-vue/es/table/interface';
 import { message } from 'ant-design-vue';
 
 // 查询客户资料列表
 function getCustomList() {
-    const filteredInfo = ref();
-    const sortedInfo = ref();
-    const columns = computed(() => {
-        // const filtered = filteredInfo.value || {};
-        // const sorted = sortedInfo.value || {};
-        // return [
-        //     {
-        //         title: '序号',
-        //         dataIndex: 'index',
-        //         key: 'index',
-        //         align: 'center',
-        //         width: 50,
-        //         customRender: (param: any) => `${param.index + 1}`,
-        //     },
-        //     {
-        //         title: 'Age',
-        //         dataIndex: 'age',
-        //         key: 'age',
-        //         sorter: (a: DataItem, b: DataItem) => a.age - b.age,
-        //         sortOrder: sorted.columnKey === 'age' && sorted.order,
-        //     },
-        //     {
-        //         title: 'Address',
-        //         dataIndex: 'address',
-        //         key: 'address',
-        //         filters: [
-        //             { text: 'London', value: 'London' },
-        //             { text: 'New York', value: 'New York' },
-        //         ],
-        //         filteredValue: filtered.address || null,
-        //         onFilter: (value: string, record: DataItem) => record.address.includes(value),
-        //         sorter: (a: DataItem, b: DataItem) => a.address.length - b.address.length,
-        //         sortOrder: sorted.columnKey === 'address' && sorted.order,
-        //         ellipsis: true,
-        //     },
-        // ];
-    });
+    interface ColumnType {
+        key: string;
+        dataIndex: string;
+        title: string;
+        onFilter?: Function;
+        sorter?: Function;
+    }
+
     const customList = ref<QueryCustomInfoType[]>([]);
+    const columns = ref<ColumnType[]>([]);
+    const filteredInfo = ref();
+    // 获取表头
+    function getColumns() {
+        interface ColumnType {
+            key: string;
+            dataIndex: string;
+            title: string;
+            filteredValue?: string | null;
+            onFilter?: Function;
+            sorter?: Function;
+        }
+        const list = getTableHead('table_pcweb_userinfo');
+        console.log('list', list);
+
+        const filtered = filteredInfo.value || {};
+        columns.value.length = 0;
+        list.forEach((e, i) => {
+            const { columnfield, columntitle } = e;
+            const item: ColumnType = {
+                key: String(i),
+                dataIndex: columnfield,
+                title: columntitle,
+            };
+            if (e.columntitle === '客户类型') {
+                item.onFilter = (value: string, record: QueryCustomInfoType) => record.userinfotype === value;
+                item.filteredValue = filtered.userinfotype || null;
+            }
+            if (e.columntitle === '客户简称') {
+                item.onFilter = (value: string, record: QueryCustomInfoType) => record.nickname.includes(value);
+                item.filteredValue = filtered.nickname || null;
+            }
+            if (e.columntitle === '客户名称') {
+                // 注意：这里绑定值 待确认
+                item.onFilter = (value: string, record: QueryCustomInfoType) => {
+                    // 用户信息类型 - 1:个人 2:企业
+                    const name = String(record.userinfotype) === '1' ? record.contactname : record.customername;
+                    name.includes(value);
+                    item.filteredValue = filtered.contactname || null;
+                };
+            }
+            if (e.columntitle === '手机号码') {
+                item.onFilter = (value: string, record: QueryCustomInfoType) => record.mobile.includes(value);
+                item.filteredValue = filtered.mobile || null;
+            }
+            columns.value.push(item);
+        });
+        console.log('columns', columns);
+    }
+    // 查询列表
     function actionQuery() {
         QueryCustomInfo(3)
             .then((res) => {
-                console.log('L', res);
+                customList.value = res.map((e, i) => {
+                    return { ...e, key: String(i) };
+                });
+                console.log('查询列表', customList);
             })
             .catch((err) => message.error(err));
     }
-
-    return { customList, actionQuery };
+    // 查询
+    function search(value: any) {
+        filteredInfo.value = value;
+        getColumns();
+        console.log('search', value);
+    }
+    return { customList, actionQuery, columns, filteredInfo, getColumns, search };
 }
 
 function add() {
     console.log('add');
 }
+
 export default defineComponent({
     name: 'custom-normal',
     components: {
         filterCustomTable,
     },
     setup() {
-        const { customList, actionQuery } = getCustomList();
-
+        const { customList, actionQuery, columns, getColumns, search } = getCustomList();
         initData(() => {
             actionQuery();
-            QueryTableDefine().then((res) => {
-                console.log('QueryTableDefine', res[0]);
-            });
+            getColumns();
             // 加载数据在这里
         });
-        return { customList, add };
+        return { customList, add, columns, search };
     },
 });
 </script>