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

src/common/methods/format/index.ts

@@ -67,9 +67,9 @@ type TIME = 's' | 'm' | 'd'
 export function formatTime(value: string | Date, type: TIME) {
     let str = 'YYYY-MM-DD HH:mm:ss';
     if (type === 'd') {
-        str = 'YYYY-MM-DD HH:mm'
+        str = 'YYYY-MM-DD'
     } else if (type === 'm') {
-        'YYYY-MM-DD'
+        'YYYY-MM-DD HH:mm'
     }
     if (value) return moment(value).format(str);
     return value;

src/common/setup/contextMenu/interface.ts

@@ -1,5 +0,0 @@
-
-export interface PermisionList {
-    code: string;   // 服务配置权限按钮 对应的 code
-    fn: Function;   // 按钮名称
-}

src/common/setup/table/index.ts

@@ -0,0 +1,176 @@
+import { ModalName } from '@/common/constants/modalName';
+import { ColumnType, getTableHead } from '@/common/methods/table';
+import { TableKey } from '@/common/methods/table/interface';
+import { Column, OperationTabMenu } from '@/services/go/commonService/interface';
+import { sessionStorageUtil } from "@/utils/storage";
+import { inject, onUnmounted, reactive, Ref, ref } from "vue";
+import { MenuType } from "../buttonPermission/interface";
+import { openModal } from "../modal";
+import { BtnClassName, BtnList, TableEventCB } from './interface';
+
+
+/**
+ * 获取动态表头数据
+ * ant-design 表格数据的过滤功能与表头绑定在一起
+ */
+export function getTableColumns() {
+    // 表头数据
+    const columns = ref<ColumnType[]>([]);
+    // 过滤信息
+    const filteredInfo = ref();
+    // 缓存 注册表头回调
+    let cacheColumnCB: Function = (): void => { };
+    // 缓存 动态表头 key
+    let cacheTableKey: keyof TableKey = 'table_pcweb_userinfo';
+    /**
+     * 注册表头
+     * @param tableName 动态表头数据key
+     * @param cb 回调函数，处理添加不同表格过滤，排序等功能
+     */
+    function registerColumn(tableName: keyof TableKey, cb: Function) {
+        cacheTableKey = tableName;
+        cacheColumnCB = cb;
+        const list = getTableHead(tableName);
+        const filtered = filteredInfo.value || {};
+        columns.value.length = 0;
+        list.forEach((e, i) => {
+            const { columnfield, columntitle, aligntype } = e;
+            const item: ColumnType = {
+                key: String(i),
+                dataIndex: columnfield, // 表格数据对应的key
+                title: columntitle,
+                align: aligntype === 1 ? 'center' : aligntype === 2 ? 'left' : 'right',
+                slots: { customRender: columnfield },
+            };
+            cb(e, item, filtered);
+            columns.value.push(item);
+        });
+    }
+    /**
+     * 更新动态表头
+     */
+    function updateColumn() {
+        registerColumn(cacheTableKey, cacheColumnCB)
+    }
+    return { columns, registerColumn, updateColumn, filteredInfo }
+}
+
+/**
+ * 表格事件
+ * @param param TableEventCB
+ * @returns 
+ */
+export function getTableEvent<T>(param: TableEventCB) {
+    // 表格展开行
+    const expandedRowKeys = ref<string[]>([]);
+    // 表格选中的数据
+    const selectedRow = reactive({})
+    function Rowclick(record: T, index: number) {
+        return {
+            onClick: () => {  // 表格点击
+                Object.assign(selectedRow, record)
+                const value = expandedRowKeys.value;
+                expandedRowKeys.value = value.length ? [] : [`${index}`];
+                param.clickCB && param.clickCB()
+            },
+            // onDblclick: () => { // 双击
+            //     console.log('onDblclick');
+            // },
+            onContextmenu: () => {  // 表格右键
+                Object.assign(selectedRow, record)
+                param.contextmenuCB && param.contextmenuCB()
+            },
+        };
+    }
+    return { expandedRowKeys, selectedRow, Rowclick }
+}
+
+/**
+ * 获取class 名
+ * @param val 
+ * @returns 
+ */
+function getClassName(val: string): BtnClassName {
+    let result: BtnClassName = 'btnDeafault'
+    if (val.includes('disable') || val.includes('cancle') || val.includes('delete')) {
+        result = 'btnDanger'
+    } else if (val === '') {
+        result = 'btnDeafault'
+    } else if (val.includes('add')) {
+        result = 'operBtn'
+    } else {
+        result = 'btnPrimary'
+    }
+    return result
+}
+
+/**
+ * 获取表格操作按钮列表
+ * @param menuType 
+ * @param hasDetail 操作按钮是否需要详情按钮（详情按钮服务 不配置）
+ * @returns 
+ */
+export function getBtnList(menuType: keyof MenuType, hasDetail: boolean) {
+    // 获取 数据
+    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>;
+    const name = 'permissionData'
+    // 存入sessionStorageUtil 是为了处理页面刷新的情况（这个时候重新从服务获取数据，但页面已经先加载了，vue 中的 依赖注入在异步中不能建立通信）
+    const data: OperationTabMenu[] = permissionData.value.length ? permissionData.value : sessionStorageUtil.getItem(name)
+    sessionStorageUtil.setItem(name, data)
+
+    const commonBtn = ref<BtnList[]>([]); // 通用按钮列表，不用选中数据才显示
+    const forDataBtn = ref<BtnList[]>([]); // 针对数据按钮列表，选中某条数据才显示
+
+    const list = data.find((e) => e.code === menuType);
+    if (list && list.children) {
+        list.children.forEach(e => {
+            const { code, type, title } = e;
+            if (type === 2) { // 按钮类型
+                const { openAction } = openModal(code as keyof ModalName);
+                const item = { lable: title, callback: openAction, className: getClassName(code) }
+                const commonName = ['新增'] // 目前通用的按钮只要新增，需要添加其它的时候需要往这里添加
+                if (commonName.includes(title)) { // 
+                    commonBtn.value.push(item)
+                } else {
+                    forDataBtn.value.push(item)
+                }
+            }
+        })
+    } else {
+        console.warn(`menuType: ${menuType}未找到`)
+    }
+    // 详情
+    if (hasDetail) {
+        const { openAction } = openModal('detail')
+        forDataBtn.value.push({ lable: '详情', callback: openAction, className: getClassName('') })
+    }
+
+
+    onUnmounted(() => {
+        sessionStorageUtil.removeItem(name)
+    });
+    return { commonBtn, forDataBtn }
+}
+
+// /**
+//  * 获取表格数据
+//  * @param param 
+//  * @returns 
+//  */
+// export function getTableData<T>(param: TableEventCB) {
+//     // 加载状态
+//     const loading = ref<boolean>(false);
+//     // 表格数据
+//     const tableList = ref<T[]>([]);
+//     // 获取表头数据
+//     const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns()
+//     // 获取表格事件
+//     const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<T>(param)
+//     return {
+//         loading, tableList,
+//         columns, registerColumn, updateColumn, filteredInfo,
+//         expandedRowKeys, selectedRow, Rowclick,
+//     }
+// }
+
+export type { Column, ColumnType };

src/common/setup/table/interface.ts

@@ -0,0 +1,12 @@
+export interface TableEventCB {
+    clickCB?: Function; // 单击事件回调函数
+    contextmenuCB?: Function; // 右键事件回调函数
+    dblclick?: Function; // 双击事件回调函数
+}
+
+export type BtnClassName = 'btnDeafault' | 'btnPrimary' | 'btnDanger' | 'operBtn'
+export interface BtnList {
+    lable: string;  // 按钮名字
+    callback: Function;
+    className: BtnClassName    // 按钮 class 名字
+}

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

@@ -17,7 +17,7 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="客户类型">
-            <span class="white">{{ detail.userinfotype === '2' ? '企业' : '个人' }}</span>
+            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -29,31 +29,31 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="企业简称">
-            <span class="white">{{ detail.nickname }}</span>
+            <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ detail.cardtypename }}</span>
+            <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="法定代表人">
-            <span class="white">{{ detail.legalpersonname }}</span>
+            <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件号码">
-            <span class="white">{{ detail.cardnum }}</span>
+            <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="纳税人识别号">
-            <span class="white">{{ detail.taxpayernum }}</span>
+            <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -67,19 +67,19 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="联系人">
-            <span class="white">{{ detail.contactname }}</span>
+            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="联系人手机号">
-            <span class="white">{{ detail.mobile }}</span>
+            <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="联系电话">
-            <span class="white">{{ detail.telphone }}</span>
+            <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -91,14 +91,14 @@
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="通讯地址">
-            <span class="white">{{ detail.address }}</span>
+            <span class="white">{{ formatValue(selectedRow.address) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="备注">
-            <span class="white">{{ detail.remark }}</span>
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -127,21 +127,6 @@ export default defineComponent({
         console.log('props', props.selectedRow);
 
         const { visible, cancel } = closeModal('detail');
-        const detail = reactive({
-            nickname: props.selectedRow.nickname || '--',
-            userinfotype: props.selectedRow.userinfotype || '--',
-            customername: props.selectedRow.customername || '--',
-            cardtypename: props.selectedRow.cardtypename || '--',
-            legalpersonname: props.selectedRow.legalpersonname || '--',
-            cardnum: props.selectedRow.cardnum || '--',
-            taxpayernum: props.selectedRow.taxpayernum || '--',
-            contactname: props.selectedRow.contactname || '--',
-            mobile: props.selectedRow.mobile || '--',
-            telphone: props.selectedRow.telphone || '--',
-            status: getStatusName(props.selectedRow.status) || '--',
-            address: props.selectedRow.address || '--',
-            remark: props.selectedRow.remark || '--',
-        });
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;
@@ -155,7 +140,6 @@ export default defineComponent({
             cancel,
             submit,
             loading,
-            detail,
             formatValue,
             getStatusName,
         };

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

@@ -12,7 +12,7 @@
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="customList">
+               :data-source="tableList">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
@@ -43,16 +43,11 @@ import ModifyCustom from '@/views/information/custom/compoments/modify/index.vue
 import DisableCustom from '@/views/information/custom/compoments/disable/index.vue';
 import AddCustom from '@/views/information/custom/compoments/add/index.vue';
 import { getBtnList } from '@/common/setup/contextMenu/index';
-import { handleTableEvent } from '@/common/setup/event/index';
 import BtnList from '@/common/components/buttonList/index.vue';
-import { getCustomModule } from '@/common/setup/customModule';
-import DeleteCustom from '@/views/information/custom/compoments/delete/index.vue';
-import RecoverCustom from '@/views/information/custom/compoments/recover/index.vue';
-import { Column } from '@/services/go/commonService/interface';
-import { ColumnType } from '@/common/methods/table';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { message } from 'ant-design-vue';
-import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
+import { getTableColumns, getTableEvent } from '@/common/setup/table/index';
+import { queryTableList, getFilterTableCB } from '../setup';
+
 export default defineComponent({
     name: 'custom-normal',
     components: {
@@ -65,53 +60,39 @@ export default defineComponent({
         BtnList,
     },
     setup() {
-        const { columns, customList, filteredInfo, loading, getColumns, getColumnsList, columnsListToUpdate } = getCustomModule<QueryCustomInfoType>();
+        // 表头数据
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        // 表格操作按钮列表
+        const { commonBtn, forDataBtn } = getBtnList('custom_info_normal', true);
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList(3);
         initData(() => {
             // 获取列表数据
-            getColumnsList(() => {
-                loading.value = true;
-                customList.value.length = 0;
-                QueryCustomInfo(3)
-                    .then((res) => {
-                        customList.value = res.map((e, i) => {
-                            return { ...e, key: String(i) };
-                        });
-                        loading.value = false;
-                        console.log('查询列表', customList);
-                    })
-                    .catch((err) => {
-                        message.error(err);
-                        loading.value = false;
-                    });
-            });
-            // 注册表头信息
-            getColumns('table_pcweb_userinfo', (e: Column, item: ColumnType, filtered: any) => {
-                // 以下添加过滤数据对应的方法
-                if (e.columntitle === '客户类型') {
-                    item.onFilter = (value: string, record: QueryCustomInfoType) => record.userinfotype.includes(String(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) => record.contactname.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;
-                }
-            });
+            queryTable();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_userinfo', getFilterTableCB);
         });
         // 查询
         function search(value: any) {
+            debugger;
             filteredInfo.value = value;
             // 更新表信息
-            columnsListToUpdate();
+            updateColumn();
         }
-        return { customList, columns, search, loading, ...getBtnList('custom_info_normal', true), ...handleTableEvent() };
+        return {
+            columns,
+            filteredInfo,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            commonBtn,
+            forDataBtn,
+            loading,
+            tableList,
+            search,
+        };
     },
 });
 </script>

src/views/information/custom/list/setup.ts

@@ -0,0 +1,61 @@
+import { Column, ColumnType } from '@/common/setup/table/index';
+import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { QueryCustomInfoEnum } from '@/services/go/ermcp/customInfo/type';
+import { message } from 'ant-design-vue';
+import { ref } from 'vue';
+
+/**
+ * 获取表格列表数据
+ * @param type 
+ * @returns 
+ */
+export function queryTableList(type: QueryCustomInfoEnum) {
+    // 加载状态
+    const loading = ref<boolean>(false);
+    // 表格数据
+    const tableList = ref<QueryCustomInfoType[]>([]);
+    function queryTable() {
+        QueryCustomInfo(type)
+            .then((res) => {
+                tableList.value = res.map((e, i) => {
+                    return { ...e, key: String(i) };
+                });
+                loading.value = false;
+                console.log('查询列表', tableList);
+            })
+            .catch((err) => {
+                message.error(err);
+                loading.value = false;
+            });
+    }
+    return { loading, tableList, queryTable }
+}
+
+/**
+ * 过滤表格的回调函数
+ * @param e 
+ * @param item 
+ * @param filtered 
+ */
+export function getFilterTableCB(e: Column, item: ColumnType, filtered: any) {
+    // 以下添加过滤数据对应的方法
+    if (e.columntitle === '客户类型') {
+        item.onFilter = (value: string, record: QueryCustomInfoType) => record.userinfotype.includes(String(value));
+        item.filteredValue = filtered.userinfotype || null;
+    }
+    if (e.columntitle === '客户简称') {
+        debugger;
+        item.onFilter = (value: string, record: QueryCustomInfoType) => record.nickname.includes(value);
+        item.filteredValue = filtered.nickname || null;
+    }
+    if (e.columntitle === '客户名称') {
+        item.onFilter = (value: string, record: QueryCustomInfoType) => record.contactname.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;
+    }
+}
+

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

@@ -1,113 +1,104 @@
 <template>
-    <!-- 客户信息: 停用 -->
-    <div class="custom-normal" :loading="loading">
-        <filterCustomTable @search="search">
-            <BtnList :btnList="commonBtn" />
-        </filterCustomTable>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns" class="topTable" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :pagination="false" rowKey="key" :data-source="customList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn" />
-                </template>
-                <template #userinfotype="{ text }">
-                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- 新增 -->
-        <AddCustom />
-        <!-- 详情 -->
-        <CustomDetail />
-        <!-- 删除 -->
-        <DeleteCustom />
-        <!-- 恢复客户资料 -->
-        <RecoverCustom />
-    </div>
+  <!-- 客户信息: 停用 -->
+  <div class="custom-normal"
+       :loading="loading">
+    <filterCustomTable @search="search">
+      <BtnList :btnList="commonBtn" />
+    </filterCustomTable>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               :pagination="false"
+               rowKey="key"
+               :data-source="customList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
+        <template #userinfotype="{ text }">
+          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 新增 -->
+    <AddCustom />
+    <!-- 详情 -->
+    <CustomDetail />
+    <!-- 删除 -->
+    <DeleteCustom />
+    <!-- 恢复客户资料 -->
+    <RecoverCustom />
+  </div>
 </template>
 
 <script lang="ts">
-    import { defineComponent, Ref } from 'vue';
-    import { initData } from '@/common/methods/index';
-    import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
-    import contextMenu from '@/common/components/contextMenu/index.vue';
-    import { getCustomModule } from '@/common/setup/customModule';
-    import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
-    import DeleteCustom from '@/views/information/custom/compoments/delete/index.vue';
-    import RecoverCustom from '@/views/information/custom/compoments/recover/index.vue';
-    import AddCustom from '@/views/information/custom/compoments/add/index.vue';
-    import { getBtnList } from '@/common/setup/contextMenu/index';
-    import { handleTableEvent } from '@/common/setup/event/index';
-    import BtnList from '@/common/components/buttonList/index.vue';
-    import { Column } from '@/services/go/commonService/interface';
-    import { ColumnType } from '@/common/methods/table';
-    import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-    import { message } from 'ant-design-vue';
-    import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
-    export default defineComponent({
-        name: 'custom-normal',
-        components: {
-            filterCustomTable,
-            contextMenu,
-            CustomDetail,
-            DeleteCustom,
-            RecoverCustom,
-            AddCustom,
-            BtnList,
-        },
-        setup() {
-            const { columns, customList, filteredInfo, loading, getColumns, getColumnsList, columnsListToUpdate } = getCustomModule<QueryCustomInfoType>();
-            initData(() => {
-                // 获取列表数据
-                getColumnsList(() => {
-                    loading.value = true;
-                    customList.value.length = 0;
-                    QueryCustomInfo(4)
-                        .then((res) => {
-                            customList.value = res.map((e, i) => {
-                                return { ...e, key: String(i) };
-                            });
-                            loading.value = false;
-                            console.log('查询列表', customList);
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                            loading.value = false;
-                        });
-                });
-                // 注册表头信息
-                getColumns('table_pcweb_userinfo', (e: Column, item: ColumnType, filtered: any) => {
-                    // 以下添加过滤数据对应的方法
-                    if (e.columntitle === '客户类型') {
-                        item.onFilter = (value: string, record: QueryCustomInfoType) => record.userinfotype.includes(String(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) => record.contactname.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;
-                    }
-                });
-            });
-            // 查询
-            function search(value: any) {
-                filteredInfo.value = value;
-                // 更新表信息
-                columnsListToUpdate();
-            }
-            return { customList, columns, search, loading, ...getBtnList('custom_info_disabled', true), ...handleTableEvent() };
-        },
-    });
+import { defineComponent } from 'vue';
+import { initData } from '@/common/methods/index';
+import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
+import contextMenu from '@/common/components/contextMenu/index.vue';
+import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
+import DeleteCustom from '@/views/information/custom/compoments/delete/index.vue';
+import RecoverCustom from '@/views/information/custom/compoments/recover/index.vue';
+import AddCustom from '@/views/information/custom/compoments/add/index.vue';
+import { getBtnList } from '@/common/setup/contextMenu/index';
+import BtnList from '@/common/components/buttonList/index.vue';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { getTableColumns, getTableEvent } from '@/common/setup/table/index';
+import { queryTableList, getFilterTableCB } from '../setup';
+
+export default defineComponent({
+    name: 'custom-normal',
+    components: {
+        filterCustomTable,
+        contextMenu,
+        CustomDetail,
+        DeleteCustom,
+        RecoverCustom,
+        AddCustom,
+        BtnList,
+    },
+    setup() {
+        // 表头数据
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        // 表格操作按钮列表
+        const { commonBtn, forDataBtn } = getBtnList('custom_info_disabled', true);
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList(3);
+        initData(() => {
+            // 获取列表数据
+            queryTable();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_userinfo', getFilterTableCB);
+        });
+        // 查询
+        function search(value: any) {
+            debugger;
+            filteredInfo.value = value;
+            // 更新表信息
+            updateColumn();
+        }
+        return {
+            columns,
+            filteredInfo,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            commonBtn,
+            forDataBtn,
+            loading,
+            tableList,
+            search,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-normal {
-    }</style
+.custom-normal {
+}
+</style
 >;

src/views/information/spot-contract/components/detail/index.vue

@@ -11,94 +11,171 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
+    <a class="white">
+      基本信息
+    </a>
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="客户类型">
-            <span class="white">企业</span>
+          <a-form-item label="合同编号">
+            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="企业名称">
-            <span class="white">深圳市前海矿业有限公司</span>
+          <a-form-item label="合同类型">
+            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="企业简称">
-            <span class="white">前海矿业</span>
+          <a-form-item label="业务类型">
+            <span class="white">{{ formatValue(selectedRow.biztype) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="证件类型">
-            <span class="white">营业执照</span>
+          <a-form-item label="采购方">
+            <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="法定代表人">
-            <span class="white">李顺利</span>
+          <a-form-item label="销售方">
+            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="证件号码">
-            <span class="white">4328648236492432</span>
+          <a-form-item label="合同附件">
+            <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="纳税人识别号">
-            <span class="white">57465736DR46456</span>
+          <a-form-item label="状态">
+            <span class="white">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <a class="white">
+      现货信息
+    </a>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="现货品种">
+            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="营业执照">
-            <div class="upload">
-              <a class="blue">查看附件</a>
-            </div>
+          <a-form-item label="品类">
+            <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="联系人">
-            <span class="white">王平</span>
+          <a-form-item label="品牌">
+            <span class="white">{{ formatValue(selectedRow.brandname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="联系人手机号">
-            <span class="white">13745653421</span>
+          <a-form-item label="标仓系数">
+            <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="联系电话">
-            <span class="white">0755-34342544</span>
+          <a-form-item label="商品规格">
+            <span class="white">{{ formatValue(selectedRow.spotgoodsdesc) }}</span>
           </a-form-item>
         </a-col>
+      </a-row>
+    </a-form>
+    <a class="white">
+      价格信息
+    </a>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="状态">
-            <span class="green">正常</span>
+          <a-form-item label="定价类型">
+            <span class="white">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="数量">
+            <span class="white">{{ formatValue(selectedRow.qty) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="点价合约">
+            <span class="white">{{ formatValue(selectedRow.goodscode) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="升贴水">
+            <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
+        <a-col :span="12">
+          <a-form-item label="点价期">
+            <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="交收期">
+            <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</span>
           </a-form-item>
         </a-col>
       </a-row>
+    </a-form>
+    <a class="white">
+      其它信息
+    </a>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
       <a-row :gutter="24">
-        <a-col :span="24">
+        <a-col :span="12">
+          <a-form-item label="保证金">
+            <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="业务员">
+            <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="跟单员">
+            <span class="white">{{ formatValue(selectedRow.meruserlogincode) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="期货账户">
+            <span class="white">{{ formatValue(selectedRow.accountid) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
           <a-form-item label="备注">
-            <span class="white">深圳市前海矿业有限公司</span>
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -107,12 +184,23 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { defineComponent, PropType, reactive, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { getStatusName } from '@/views/information/custom/setup';
+import { getContractStatusName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { formatValue, formatTime } from '@/common/methods/format';
 
 export default defineComponent({
     name: 'spot-contract-detail',
     components: {},
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3ContractRsp>,
+            default: {},
+        },
+    },
     setup() {
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
@@ -128,6 +216,10 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            formatValue,
+            getContractStatusName,
+            getPriceTypeName,
+            formatTime,
         };
     },
 });

src/views/information/spot-contract/list/checkpending/index.vue

@@ -23,7 +23,7 @@
       </a-table>
     </contextMenu>
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil />
+    <SpotContractDeatil  :selectedRow="selectedRow" />
     <!-- 现货合同: 审核 -->
     <Check />
     <!-- 现货合同: 撤销 -->

src/views/information/spot-contract/list/finished/index.vue

@@ -25,7 +25,7 @@
     <!-- 新增现货合同 -->
     <AddSpotContract />
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil />
+    <SpotContractDeatil  :selectedRow="selectedRow" />
   </div>
 </template>
 

src/views/information/spot-contract/list/performance/index.vue

@@ -23,7 +23,7 @@
       </a-table>
     </contextMenu>
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil />
+    <SpotContractDeatil  :selectedRow="selectedRow" />
     <!-- 现货合同: 正常完结 -->
     <Finish />
   </div>

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -25,7 +25,7 @@
     <!-- 新增现货合同 -->
     <AddSpotContract />
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil />
+    <SpotContractDeatil  :selectedRow="selectedRow" />
     <!-- 现货合同: 修改 -->
     <ModifySpotContract />
     <!-- 现货合同: 删除 -->

src/views/information/spot-contract/setup.ts

@@ -0,0 +1,50 @@
+/**
+ * 现货合同状态返回
+ * @param state
+ * //合同状态 - number;
+ //:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+ */
+export function getContractStatusName(state: number) : string{
+    let result : string = "--";
+    switch (state){
+        case 1:
+            result = "待审核";
+            break
+        case 2:
+            result = "执行中";
+            break
+        case 3:
+            result = "正常完结";
+            break
+        case 4:
+            result = "审核拒绝";
+            break
+        case 5:
+            result = "异常完结";
+            break
+        case 6:
+            result = "已撤回";
+            break
+    }
+    return result
+}
+
+/**
+ * 定价类型返回 - 1:一口价 2:点价 3:暂定价
+ * @param state
+ */
+export function getPriceTypeName(state: number) : string{
+    let result : string = "--";
+    switch (state){
+        case 1:
+            result = "一口价";
+            break
+        case 2:
+            result = "点价";
+            break
+        case 3:
+            result = "暂定价";
+            break
+    }
+    return result
+}

src/views/information/warehouse-info/compoments/detail/index.vue

@@ -12,16 +12,78 @@
                 @click="submit">关闭</a-button>
     </template>
     仓库信息详情
+      <a-form class="inlineForm"
+              :form="form"
+              @submit="handleSearch">
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="仓库类型">
+                      <span class="white">{{ getWareHouseTypeName(selectedRow.warehousetype) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="仓库名称">
+                      <span class="white">{{ formatValue(selectedRow.warehousename)}}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="仓库简称">
+                      <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="联系人">
+                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系电话">
+                      <span class="white">{{ formatValue(selectedRow.contactnum) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="white">{{ gerWareHouseStatusName(selectedRow.warehousestatus) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="所在地区">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="详细地址">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {ErmcpWareHouseInfo} from "@/services/go/ermcp/warehouse-info/interface";
+import {gerWareHouseStatusName, getWareHouseTypeName} from "@/views/information/warehouse-info/setup";
+import {formatValue} from "@/common/methods";
 
 export default defineComponent({
     name: 'warehouse_info_btn-detail',
     components: {},
+    props:{
+        selectedRow: {
+            type: Object as PropType<ErmcpWareHouseInfo>,
+            default: {},
+        },
+    },
     setup() {
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
@@ -37,6 +99,9 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            gerWareHouseStatusName,
+            getWareHouseTypeName,
+            formatValue
         };
     },
 });

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -30,7 +30,7 @@
     <!-- 停用仓库信息 -->
     <Disable />
     <!-- 仓库信息详情 -->
-    <Detail />
+    <Detail :selectedRow="selectedRow" />
     <!-- 修改仓息库信 -->
     <Modify />
   </div>

src/views/information/warehouse-info/setup.ts

@@ -0,0 +1,42 @@
+/**
+ * 仓库状态名称 - 1:正常 2:注销 3:待审核 4:审核拒绝
+ * @param status
+ */
+export function gerWareHouseStatusName(status: number): string{
+    let result : string = "--";
+    switch (status){
+        case 1:
+            result = "正常";
+            break
+        case 2:
+            result = "注销";
+            break
+        case 3:
+            result = "待审核";
+            break
+        case 4:
+            result = "审核拒绝";
+            break
+    }
+    return result
+}
+
+/**
+ * 仓库类型 - 1 厂库 2 自有库 3 合作库
+ * @param type
+ */
+export function getWareHouseTypeName(type: number): string{
+    let result : string = "--";
+    switch (type){
+        case 1:
+            result = "厂库";
+            break
+        case 2:
+            result = "自有库";
+            break
+        case 3:
+            result = "合作库";
+            break
+    }
+    return result
+}