Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/constants/order.ts

@@ -478,4 +478,21 @@ export function getWRPresaleStatusList() {
 export function getWRPresaleStatusName(value: number) {
     const enums = getWRPresaleStatusList()
     return getEnumTypeName(enums, value)
+}
+
+/**
+ * 获取操作类型列表
+ * @returns 
+ */
+export function getOperateTypeList() {
+    return getEnumTypeList('operateType')
+}
+
+/**
+ * 获取操作类型名称
+ * @returns 
+ */
+export function getOperateTypeName(value: number) {
+    const enums = getOperateTypeList()
+    return getEnumTypeName(enums, value)
 }

src/packages/pc/views/query/capital/history/index.vue

@@ -37,7 +37,7 @@ import { queryHisAmountLog } from '@/services/api/bank'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeOrderDetailReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Model.HisAmountLogReq>()
 const filterDate = shallowRef<string[]>([])
 
 const { loading, dataList, run } = useRequest(queryHisAmountLog, { manual: true })

src/packages/pc/views/query/order/spot/history/index.vue

@@ -69,6 +69,18 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'wrtradeorderstatus', label: '状态' },
 ])
 
+filterOptons.selectList = [
+    {
+        key: 'wrtradetype',
+        selectedValue: 1,
+        options: [
+            { label: getWrTradeTypeName(1), value: 1 },
+            { label: getWrTradeTypeName(2), value: 2 },
+        ],
+        locked: true,
+    }
+]
+
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
     { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }

src/packages/pc/views/query/performance/buy/all/index.vue

@@ -3,7 +3,7 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
         <template #headerLeft>
             <app-filter :options="filterOptons">
-                <template #before>
+                <template #after>
                     <el-date-picker type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
                         v-model="filterDate" />
                 </template>
@@ -34,11 +34,11 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryPerformancePlan } from '@/services/api/performance'
-import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
+import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceStatusList, getPerformanceTypeName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.WrOrderDetailRsp>()
+const { filterOptons, getQueryParams } = useDataFilter<Model.PerformancePlanReq>()
 const filterDate = shallowRef<string[]>([])
 
 const { loading, dataList, run } = useRequest(queryPerformancePlan, {
@@ -64,6 +64,15 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'starttime', label: '开始时间' },
 ])
 
+filterOptons.selectList = [
+    {
+        key: 'status',
+        selectedValue: 2,
+        options: getPerformanceStatusList(),
+        locked: true,
+    }
+]
+
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
     { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }

src/packages/pc/views/query/performance/sell/all/index.vue

@@ -3,7 +3,7 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
         <template #headerLeft>
             <app-filter :options="filterOptons">
-                <template #before>
+                <template #after>
                     <el-date-picker type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
                         v-model="filterDate" />
                 </template>
@@ -34,11 +34,11 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryPerformancePlan } from '@/services/api/performance'
-import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
+import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceStatusList, getPerformanceTypeName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.WrOrderDetailRsp>()
+const { filterOptons, getQueryParams } = useDataFilter<Model.PerformancePlanReq>()
 const filterDate = shallowRef<string[]>([])
 
 const { loading, dataList, run } = useRequest(queryPerformancePlan, {
@@ -64,6 +64,15 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'starttime', label: '开始时间' },
 ])
 
+filterOptons.selectList = [
+    {
+        key: 'status',
+        selectedValue: 2,
+        options: getPerformanceStatusList(),
+        locked: true,
+    }
+]
+
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
     { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -57,6 +57,18 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'tradetime', label: '成交时间' },
 ])
 
+filterOptons.selectList = [
+    {
+        key: 'buildType',
+        selectedValue: 1,
+        options: [
+            { label: getBuildTypeName(1), value: 1 },
+            { label: getBuildTypeName(2), value: 2 },
+        ],
+        locked: true,
+    }
+]
+
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
     { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }

src/stores/modules/enum.ts

@@ -12,7 +12,7 @@ export interface EnumType {
     disabled?: boolean;
 }
 
-const enumKeys = ['confirmStatus', 'deliveryPayMode', 'deliveryStatus', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus'] as const
+const enumKeys = ['confirmStatus', 'deliveryPayMode', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus'] as const
 
 const enumMap = new Map<typeof enumKeys[number], ShallowRef<Model.EnumRsp[]>>()