xxxx

src/business/user/address.ts

@@ -2,7 +2,7 @@ import { shallowRef, reactive, computed } from 'vue'
 import { useDataTable } from '@/hooks/datatable'
 import { useLoginStore } from '@/stores'
 import { queryUserReceiveInfo, userReceiveInfo, delUserReceiveInfo, userReceiveIsDefault } from '@/services/api/user'
-import { getCertificateTypeList } from '@/constants/certificate'
+import { getCertificateTypeList, getSCertificateTypeList } from '@/constants/certificate'
 
 const loginStore = useLoginStore()
 
@@ -34,6 +34,7 @@ export function useAddress() {
 export function useAddressForm(selectedRow?: Model.UserReceiveInfoRsp) {
     const loading = shallowRef(false)
     const certificateTypeList = getCertificateTypeList()
+    const scertificateTypeList = getSCertificateTypeList()
 
     const formData = reactive<Proto.UserReceiveInfoReq>({
         ReceiveInfoId: 0,
@@ -111,6 +112,7 @@ export function useAddressForm(selectedRow?: Model.UserReceiveInfoRsp) {
     return {
         loading,
         certificateTypeList,
+        scertificateTypeList,
         formData,
         regionName,
         addOrUpdate,

src/constants/certificate.ts

@@ -2,6 +2,34 @@ import { useEnumStore } from '@/stores'
 
 const { getEnumTypeList, getEnumTypeName } = useEnumStore()
 
+/// 特殊处理证件类型
+export enum SCertificateType {
+    /// 个人
+    Person = 1,
+    /// 通用
+    Normal = 3,
+}
+
+/**
+ * 特殊处理证件类型列表
+ * @returns 
+ */
+export function getSCertificateTypeList() {
+    return [
+        { label: '个人', value: SCertificateType.Person },
+        { label: '通用', value: SCertificateType.Normal },
+    ]
+}
+
+/**
+ * 特殊处理证件类型名称
+ * @returns 
+ */
+export function getSCertificateTypeName(value?: number) {
+    const enums = getSCertificateTypeList()
+    return getEnumTypeName(enums, value)
+}
+
 /**
  * 获取证件类型列表
  * @returns 

src/packages/pc/views/account/address/index.vue

@@ -18,10 +18,10 @@
             {{ value ? '是' : '否' }}
         </template>
         <!-- 操作 -->
-        <template #expand>
+    <template #expand="{ row }">
             <div class="buttonbar">
                 <el-button type="primary" size="small" @click="openComponent('edit')">编辑</el-button>
-                <el-button type="success" size="small" @click="openComponent('default')">设置默认</el-button>
+                <el-button type="success" size="small" v-if="row?.isdefault === 0" @click="openComponent('default')">设置默认</el-button>
                 <el-button type="danger" size="small" @click="openComponent('delete')">删除</el-button>
             </div>
         </template>

src/packages/pc/views/footer/capital/statement/index.vue

@@ -21,7 +21,6 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountid', label: '资金账号' },
     { prop: 'operatetypename', label: '资金类型' },
     { prop: 'amount', label: '金额' },
-    { prop: 'currentbalance', label: '余额' },
     { prop: 'createtime', label: '时间' }
 ])
 </script>

src/packages/pc/views/footer/performance/components/contracted/index.vue

@@ -9,7 +9,7 @@
                 <span>{{ handleNumberValue(getPerformanceStepStatusName(selectedRow.steptypeid)) }}</span>
             </el-form-item>
             <el-form-item label="备注" prop="ApplyRemark">
-                <el-input type="textarea" :rows="3" v-model="formData.ApplyRemark" />
+                <el-input type="textarea" :rows="4" v-model="formData.ApplyRemark" />
             </el-form-item>
             <el-form-item label="附件" prop="Attachment">
                 <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" />

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

@@ -34,7 +34,6 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountid', label: '资金账号' },
     { prop: 'operatetypename', label: '资金类型' },
     { prop: 'amount', label: '金额' },
-    { prop: 'currentbalance', label: '余额' },
     { prop: 'createtime', label: '时间' }
 ])
 

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

@@ -21,7 +21,6 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountid', label: '资金账号' },
     { prop: 'operatetypename', label: '资金类型' },
     { prop: 'amount', label: '金额' },
-    { prop: 'currentbalance', label: '余额' },
     { prop: 'createtime', label: '时间' }
 ])
 </script>

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

@@ -1,6 +1,14 @@
 <!-- 资金流水-买履约-全部 -->
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <template #header>
+            <app-filter :options="filterOptons">
+                <template #before>
+                    <el-date-picker type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
+                        v-model="filterDate" />
+                </template>
+            </app-filter>
+        </template>
          <!-- 履约状态 -->
          <template #performancestatus="{ value }">
             {{ getPerformanceStatusName(value) }}
@@ -23,13 +31,17 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 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 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 filterDate = shallowRef<string[]>([])
 
-const { loading, dataList } = useRequest(queryPerformancePlan, {
+const { loading, dataList, run } = useRequest(queryPerformancePlan, {
     params: {
         buyorsell: BuyOrSell.Buy
     },
@@ -50,6 +62,22 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'performancestatus', label: '履约状态' },
     { prop: 'curstepname', label: '当前步骤' },
     { prop: 'starttime', label: '开始时间' },
-    
 ])
+
+filterOptons.buttonList = [
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
+]
+
+const onSearch = (clear = false) => {
+    if (clear) {
+        filterDate.value = []
+    }
+    getQueryParams((qs) => {
+        qs.begindate = filterDate.value[0]
+        qs.enddate = filterDate.value[1]
+        run(qs)
+    }, clear)
+}
+
 </script>

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

@@ -1,6 +1,14 @@
 <!-- 资金流水-卖履约-全部 -->
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <template #header>
+            <app-filter :options="filterOptons">
+                <template #before>
+                    <el-date-picker type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
+                        v-model="filterDate" />
+                </template>
+            </app-filter>
+        </template>
          <!-- 履约状态 -->
          <template #performancestatus="{ value }">
             {{ getPerformanceStatusName(value) }}
@@ -23,13 +31,17 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 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 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 filterDate = shallowRef<string[]>([])
 
-const { loading, dataList } = useRequest(queryPerformancePlan, {
+const { loading, dataList, run } = useRequest(queryPerformancePlan, {
     params: {
         buyorsell: BuyOrSell.Sell
     },
@@ -50,6 +62,22 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'performancestatus', label: '履约状态' },
     { prop: 'curstepname', label: '当前步骤' },
     { prop: 'starttime', label: '开始时间' },
-    
 ])
+
+filterOptons.buttonList = [
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
+]
+
+const onSearch = (clear = false) => {
+    if (clear) {
+        filterDate.value = []
+    }
+    getQueryParams((qs) => {
+        qs.begindate = filterDate.value[0]
+        qs.enddate = filterDate.value[1]
+        run(qs)
+    }, clear)
+}
+
 </script>