fix: 增加账户状态功能优化完善。

src/pages/statistic/accounts/dailyExpensesAnalysis/index.vue

@@ -170,7 +170,7 @@
     filterPanel: false,
     queryAccountParams: {
     pageNum: 1,
-    state: '1',
+    status: '1',
     pageSize: 100
   },
     queryParams: {

src/pages/statistic/bill/creditInstallmentAnalysis/index.vue

@@ -166,6 +166,7 @@ import { listBankcardLend } from '@/api/invest/bankcardlend'
     queryAccountParams: {
       pageNum: 1,
     type: '2',
+    status: '1',
     pageSize: 1000
   },
     queryParams: {

src/pages/statistic/bill/onlineLendAnalysis/index.vue

@@ -166,6 +166,7 @@ import { listBankcardLend } from '@/api/invest/bankcardlend'
     queryAccountParams: {
       pageNum: 1,
     type: '3',
+    status: '1',
     lendType: '1',
     pageSize: 1000
   },

src/pages/work/accounts/accountDealRecord/addEdit.vue

@@ -121,7 +121,7 @@ const data = reactive({
   },
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     type: '1',
     pageSize: 1000
   },

src/pages/work/accounts/accountDealRecord/list.vue

@@ -167,7 +167,7 @@ const data = reactive({
   filterPanel: false,
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/accounts/accounts/commonList.vue

@@ -76,7 +76,7 @@ const data = reactive({
   filterPanel: false,
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/accounts/accounts/list.vue

@@ -119,7 +119,7 @@ const data = reactive({
   filterPanel: false,
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/accounts/creditTransferRecord/addEdit.vue

@@ -101,13 +101,13 @@ const data = reactive({
   queryDebitCardParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/creditTransferRecord/list.vue

@@ -145,7 +145,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/accounts/debitTransferRecord/addEdit.vue

@@ -92,13 +92,13 @@ const data = reactive({
   queryOutAccountParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   queryInAccountParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/debitTransferRecord/list.vue

@@ -133,7 +133,7 @@ const data = reactive({
   filterPanel: false,
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     type: '1',
     pageSize: 100
   },

src/pages/work/accounts/investAccountDeal/addEdit.vue

@@ -92,7 +92,7 @@ const data = reactive({
   queryAccountParams: {
     pageNum: 1,
     type: '5',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/investTransferRecord/addEdit.vue

@@ -92,6 +92,7 @@ const data = reactive({
   },
   queryFutruesStocksParams: {
     pageNum: 1,
+    status: '1',
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/lendTransferRecord/addEdit.vue

@@ -108,13 +108,13 @@ const data = reactive({
   queryOutAccountParams: {
     pageNum: 1,
     type: '3',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   queryInAccountParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/posTransferRecord/addEdit.vue

@@ -101,12 +101,13 @@ const data = reactive({
   },
   queryPosMachineParams: {
     pageNum: 1,
+    status: '1',
     pageSize: 1000
   },
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/accounts/posTransferRecord/list.vue

@@ -147,7 +147,7 @@ const data = reactive({
   filterPanel: false,
   queryAccountParams: {
     pageNum: 1,
-    state: '1',
+   status: '1', 
     type: '6',
     pageSize: 100
   },

src/pages/work/base/creditCard/addEdit.vue

@@ -23,6 +23,11 @@
               <u--input v-model="form.creditLimit"  placeholder="请填写信用卡额度"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="账单日" required prop="billDate" >
               <u--input v-model="form.billDate"  placeholder="请填写账单日"
                 inputAlign="right" border="none"></u--input>
@@ -89,6 +94,8 @@
         @confirm="handleConfirm"></u-picker>
         <u-picker itemHeight="88" :show="showIsZeroBill" :columns="isZeroBillList" keyName="dictLabel" @cancel="handleIsZeroBillCancel"
         @confirm="handleIsZeroBillConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+        @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -114,6 +121,8 @@ const showIsZeroBill = ref(false)
 const title = ref("信用卡管理")
 const isNextBillDateList = ref([])
 const isZeroBillList = ref([])
+const showStatus = ref(false)
+const statusList = ref([])
 const dateType = ref(1)
 const data = reactive({
   form: {
@@ -140,7 +149,9 @@ const data = reactive({
     debitType: null,
     isNextBillDate: null,
     nextBillDateTime: null,
-    isZeroBill: null
+    isZeroBill: null,
+    status: '1',
+    statusName: '正常使用'
   },
   // dateType:'1',
   rules: {
@@ -148,6 +159,7 @@ const data = reactive({
           code: [{ type: 'string', required: true, message: '信用卡卡号不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'number', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
           payDate: [{ type: 'number', required: true, message: '还款日不能为空', trigger: ['change', 'blur'] }],  
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],  
           creditLimit: [{ type: 'number', required: true, message: '信用卡额度不能为空', trigger: ['change', 'blur'] }],  
           balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],  
           availableLimit: [{ type: 'number', required: true, message: '可用额度不能为空', trigger: ['change', 'blur'] }],  
@@ -176,6 +188,10 @@ onLoad((option) => {
        // 类型
        getDicts('is_zero_bill').then(res => {
         isZeroBillList.value =[res.data] 
+      })
+       // 类型
+       getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
       })
       if(form.value.id!=null){
         getBankcardLend(form.value.id).then(res => {
@@ -189,6 +205,11 @@ onLoad((option) => {
           form.value.isZeroBillName=dictStr(form.value.isZeroBill, result.data)
       })
 
+       // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      })
+          
         })
       }
   }
@@ -236,6 +257,25 @@ onLoad((option) => {
       function handleIsZeroBillCancel() {
        showIsZeroBill.value = false
       }
+
+      function handleShowStatus() {
+        if (statusList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '账户状态操作为空  ', type: 'warning'
+          })
+        } else {
+          showStatus.value = true
+        }
+      }
+      function   handleStatusConfirm(e) {
+        form.value.statusName = e.value[0].dictLabel
+        form.value.status = e.value[0].dictValue
+        showStatus.value = false
+      }
+      function handleStatusCancel() {
+       showStatus.value = false
+      }
+
       function  selectDate(type) {
         dateType.value=type
 				datePickShow.value = true

src/pages/work/base/creditCard/details.vue

@@ -11,6 +11,7 @@
         <u-cell title="信用卡名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="信用卡卡号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
         <u-cell title="信用卡额度:" titleStyle="font-weight:bolder" :value="detailInfo.creditLimit"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="开户日期:" titleStyle="font-weight:bolder" center :value="detailInfo.activationDate"> </u-cell>
         <u-cell title="开户行:" titleStyle="font-weight:bolder" :value="detailInfo.openingBank"></u-cell>
         <u-cell title="有效期:" titleStyle="font-weight:bolder" :value="detailInfo.effectiveDate"></u-cell>
@@ -50,6 +51,10 @@ onLoad((option) => {
                            // 类型
             getDicts('is_zero_bill').then(result => {
          detailInfo.value.isZeroBill=dictStr(detailInfo.value.isZeroBill, result.data)
+      })
+          // 类型
+              getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
       })
         })
   }

src/pages/work/base/creditCard/list.vue

@@ -21,6 +21,10 @@
             <text class="row-label">信用卡额度：</text>
             <text class="row-value">{{ item.creditLimit }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">账单日：</text>
             <text class="row-value">{{ item.billDateName }}</text>
@@ -77,6 +81,7 @@ const isShow = ref(false)
 const status = ref('loadmore')
 const isNextBillDateList = ref([])
 const isZeroBillList = ref([])
+const statusList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
 const data = reactive({
@@ -130,6 +135,10 @@ function   getDict() {
        getDicts('is_zero_bill').then(res => {
         isZeroBillList.value = res.data
       })
+       // 账户状态
+       getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId

src/pages/work/base/debitCard/addEdit.vue

@@ -19,6 +19,11 @@
               <u--input v-model="form.code"  placeholder="请填写储蓄卡卡号"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="余额" required prop="balance" >
               <u--input v-model="form.balance"  placeholder="请填写余额"
                 inputAlign="right" border="none"></u--input>
@@ -53,6 +58,8 @@
       <u-toast ref="uToast"></u-toast>
       <u-picker itemHeight="88" :show="showTeam" :columns="debitTypeList" keyName="dictLabel" @cancel="handleCancel"
         @confirm="handleConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+        @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -77,6 +84,8 @@ const showTeam = ref(false)
 const title = ref("储蓄卡管理")
 const debitTypeList = ref([])
 const dateType = ref(1)
+const showStatus = ref(false)
+const statusList = ref([])
 const data = reactive({
   form: {
     id: null,
@@ -98,13 +107,16 @@ const data = reactive({
     updateTime: null,
     delFlag: null,
     remark: null,
-    debitType: null
+    debitType: null,
+    status: '1',
+    statusName: '正常使用'
   },
   // dateType:'1',
   rules: {
           name: [{ type: 'string', required: true, message: '储蓄卡名称不能为空', trigger: ['change', 'blur'] }],
           code: [{ type: 'string', required: true, message: '储蓄卡卡号不能为空', trigger: ['change', 'blur'] }],
           balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],  
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],  
           debitTypeName: [{ type: 'string', required: true, message: '储蓄卡类型不能为空', trigger: ['change', 'blur'] }],
   }
 })
@@ -127,6 +139,10 @@ onLoad((option) => {
         // 类型
         getDicts('debit_type').then(res => {
         debitTypeList.value =[res.data] 
+      })
+       // 类型
+       getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
       })
       if(form.value.id!=null){
         getBankcardLend(form.value.id).then(res => {
@@ -136,6 +152,10 @@ onLoad((option) => {
           form.value.debitTypeName=dictStr(form.value.debitType, result.data)
       })
           
+       // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      })
         })
       }
   }
@@ -166,6 +186,24 @@ onLoad((option) => {
       function handleCancel() {
        showTeam.value = false
       }
+      function handleShowStatus() {
+        if (statusList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '账户状态操作为空  ', type: 'warning'
+          })
+        } else {
+          showStatus.value = true
+        }
+      }
+      function   handleStatusConfirm(e) {
+        form.value.statusName = e.value[0].dictLabel
+        form.value.status = e.value[0].dictValue
+        showStatus.value = false
+      }
+      function handleStatusCancel() {
+       showStatus.value = false
+      }
+
       function  selectDate(type) {
         dateType.value=type
 				datePickShow.value = true

src/pages/work/base/debitCard/details.vue

@@ -11,6 +11,7 @@
         <u-cell title="储蓄卡名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="储蓄卡卡号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
         <u-cell title="储蓄卡类型:" titleStyle="font-weight:bolder" :value="detailInfo.debitType"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="开户行:" titleStyle="font-weight:bolder" :value="detailInfo.openingBank"></u-cell>
         <u-cell title="开户日期:" titleStyle="font-weight:bolder" center :value="detailInfo.activationDate"> </u-cell>
         <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
@@ -40,6 +41,10 @@ onLoad((option) => {
                      // 类型
             getDicts('debit_type').then(result => {
          detailInfo.value.debitType=dictStr(detailInfo.value.debitType, result.data)
+      })
+                // 类型
+          getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
       })
         })
   }

src/pages/work/base/debitCard/list.vue

@@ -37,6 +37,10 @@
             <text class="row-label">储蓄卡类型：</text>
             <text class="row-value">{{ dictStr(item.debitType, debitTypeList) }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <!-- <view class="item-row">
             <text class="row-label">储蓄卡卡号：</text>
             <text class="row-value">{{ item.code }}</text>
@@ -80,6 +84,7 @@ const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
 const debitTypeList = ref([])
+const statusList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
 const data = reactive({
@@ -130,6 +135,10 @@ function   getDict() {
       getDicts('debit_type').then(res => {
         debitTypeList.value = res.data
       })
+       // 账户状态
+       getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId

src/pages/work/base/futures/addEdit.vue

@@ -20,6 +20,11 @@
               <u--input v-model="form.code"  placeholder="请填写账号"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="密码" prop="password"  >
               <u--input v-model="form.password"  placeholder="请填写密码"
                 inputAlign="right" border="none"></u--input>
@@ -67,6 +72,8 @@
       <u-toast ref="uToast"></u-toast>
       <u-picker itemHeight="88" :show="showDebitCard" :columns="debitCardList" keyName="nameCodeAvailableLimit" @cancel="handleDebitCardCancel"
       @confirm="handleDebitCardConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+      @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -81,6 +88,7 @@
   <script setup>
 import { getFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
   import { listAccounts } from '@/api/invest/accounts'
+    import { getDicts } from '@/api/system/dict/data.js'
   const { proxy } = getCurrentInstance()
   import dayjs from 'dayjs'
   import {onLoad,onReady} from "@dcloudio/uni-app";
@@ -91,6 +99,8 @@ const showDebitCard = ref(false)
 const title = ref("期货账户管理")
 const debitCardList = ref([])
 const dateType = ref(1)
+const showStatus = ref(false)
+const statusList = ref([])
 const data = reactive({
   form: {
     id: null,
@@ -110,18 +120,21 @@ const data = reactive({
     updateBy: null,
     updateTime: null,
     delFlag: null,
-    remark: null
+    remark: null,
+    status: '1',
+    statusName: '正常使用'
   },
   queryDebitCardParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   // dateType:'1',
   rules: {
           name: [{ type: 'string', required: true, message: '期货账户名称不能为空', trigger: ['change', 'blur'] }],
           code: [{ type: 'string', required: true, message: '账号不能为空', trigger: ['change', 'blur'] }],
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],  
   }
 })
 const { form, queryDebitCardParams, rules} = toRefs(data)
@@ -140,6 +153,10 @@ onLoad((option) => {
     form.value.effectiveDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
   })
   function  getDict() {
+      // 类型
+      getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
+      })
         // 类型
         listAccounts(queryDebitCardParams.value).then((response) => {
        debitCardList.value = [response.rows] 
@@ -148,10 +165,22 @@ onLoad((option) => {
       if(form.value.id!=null){
         getFutureStocks(form.value.id).then(res => {
           form.value = res.data
+          // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      })
         })
       }
   }
-
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
     function handleDebitCard() {
         if (debitCardList.value[0].length === 0) {
           proxy.$refs['uToast'].show({
@@ -169,6 +198,24 @@ onLoad((option) => {
  function handleDebitCardCancel() {
        showDebitCard.value = false
     }
+
+    function handleShowStatus() {
+        if (statusList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '账户状态操作为空  ', type: 'warning'
+          })
+        } else {
+          showStatus.value = true
+        }
+      }
+      function   handleStatusConfirm(e) {
+        form.value.statusName = e.value[0].dictLabel
+        form.value.status = e.value[0].dictValue
+        showStatus.value = false
+      }
+      function handleStatusCancel() {
+       showStatus.value = false
+      }
       function  selectDate(type) {
         dateType.value=type
 				datePickShow.value = true

src/pages/work/base/futures/details.vue

@@ -10,6 +10,7 @@
         <u-cell-group>
         <u-cell title="名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="账号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="期货交易中心账号:" titleStyle="font-weight:bolder" :value="detailInfo.tradingCenterCode"></u-cell>
         <u-cell title="手续费:" titleStyle="font-weight:bolder" center :value="detailInfo.commission"> </u-cell>
         <u-cell title="保证金比例:" titleStyle="font-weight:bolder" :value="detailInfo.bond"></u-cell>
@@ -24,6 +25,7 @@
   
 <script setup>
 import {  getFutureStocks } from '@/api/invest/futureStocks'
+import { getDicts } from '@/api/system/dict/data.js'
 import {onLoad} from "@dcloudio/uni-app";
 import {reactive ,toRefs,ref,computed }from "vue";
 const id = ref('')
@@ -38,6 +40,10 @@ onLoad((option) => {
   function getInfo() {
     getFutureStocks(id.value).then(res => {
           detailInfo.value = res.data
+          // 类型
+          getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
+      })
         })
   }
   function dictStr(val, arr) {

src/pages/work/base/futures/list.vue

@@ -16,7 +16,10 @@
             <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
               :text="item.name+'-'+item.code " size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
-         
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">期货交易中心账号：</text>
             <text class="row-value">{{ item.tradingCenterCode }}</text>
@@ -60,6 +63,7 @@
 <script setup>
 import { listFutureStocks, delFutureStocks} from '@/api/invest/futureStocks'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import { getDicts } from '@/api/system/dict/data.js'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -68,6 +72,7 @@ const isShow = ref(false)
 const status = ref('loadmore')
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const statusList = ref([])
 const data = reactive({
   queryParams: {
     name: null,
@@ -79,6 +84,10 @@ const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
+   // 账户状态
+   getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
     getList()
   });
 

src/pages/work/base/lend/addEdit.vue

@@ -24,6 +24,11 @@
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="余额" required prop="balance" >
               <u--input v-model="form.balance"  placeholder="请填写余额"
                 inputAlign="right" border="none"></u--input>
@@ -45,6 +50,8 @@
       <u-toast ref="uToast"></u-toast>
       <u-picker itemHeight="88" :show="showTeam" :columns="lendTypeList" keyName="dictLabel" @cancel="handleCancel"
         @confirm="handleConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+        @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -69,6 +76,8 @@ const showTeam = ref(false)
 const title = ref("借贷账户管理")
 const lendTypeList = ref([])
 const dateType = ref(1)
+const showStatus = ref(false)
+const statusList = ref([])
 const data = reactive({
   form: {
     id: null,
@@ -91,12 +100,15 @@ const data = reactive({
     updateTime: null,
     delFlag: null,
     remark: null,
-    debitType: null
+    debitType: null,
+    status: '1',
+    statusName: '正常使用'
   },
   // dateType:'1',
   rules: {
           name: [{ type: 'string', required: true, message: '借贷名称不能为空', trigger: ['change', 'blur'] }],
           code: [{ type: 'string', required: true, message: '账号不能为空', trigger: ['change', 'blur'] }],
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],  
           balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],  
           lendTypeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
   }
@@ -120,6 +132,10 @@ onLoad((option) => {
         // 类型
         getDicts('lend_type').then(res => {
         lendTypeList.value =[res.data] 
+      })
+       // 类型
+       getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
       })
       if(form.value.id!=null){
         getBankcardLend(form.value.id).then(res => {
@@ -128,7 +144,10 @@ onLoad((option) => {
         getDicts('lend_type').then(result => {
           form.value.lendTypeName=dictStr(form.value.lendType, result.data)
       })
-          
+           // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      })
         })
       }
   }
@@ -159,6 +178,23 @@ onLoad((option) => {
       function handleCancel() {
        showTeam.value = false
       }
+      function handleShowStatus() {
+        if (statusList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '账户状态操作为空  ', type: 'warning'
+          })
+        } else {
+          showStatus.value = true
+        }
+      }
+      function   handleStatusConfirm(e) {
+        form.value.statusName = e.value[0].dictLabel
+        form.value.status = e.value[0].dictValue
+        showStatus.value = false
+      }
+      function handleStatusCancel() {
+       showStatus.value = false
+      }
       function  selectDate(type) {
         dateType.value=type
 				datePickShow.value = true

src/pages/work/base/lend/details.vue

@@ -11,6 +11,7 @@
         <u-cell title="借贷名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="账号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
         <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.lendType"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
       </u-cell-group>
       </view>
@@ -38,6 +39,10 @@ onLoad((option) => {
                      // 类型
             getDicts('lend_type').then(result => {
          detailInfo.value.lendType=dictStr(detailInfo.value.lendType, result.data)
+      })
+       // 类型
+       getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
       })
         })
   }

src/pages/work/base/lend/list.vue

@@ -37,6 +37,10 @@
             <text class="row-label">类型：</text>
             <text class="row-value">{{ dictStr(item.lendType, lendTypeList) }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">备注：</text>
             <text class="row-value">{{ item.remark }}</text>
@@ -70,6 +74,7 @@ const status = ref('loadmore')
 const lendTypeList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const statusList = ref([])
 const data = reactive({
   filterPanel: false,
   queryParams: {
@@ -113,6 +118,10 @@ function getList() {
       })
     }
 function   getDict() {
+    // 账户状态
+    getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
       // 类型
       getDicts('lend_type').then(res => {
         lendTypeList.value = res.data

src/pages/work/base/posmachine/addEdit.vue

@@ -20,6 +20,11 @@
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="商户名称" prop="merchantName" required >
               <u--input v-model="form.merchantName"  placeholder="请填写商户名称"
                 inputAlign="right" border="none"></u--input>
@@ -80,6 +85,8 @@
         @confirm="handleConfirm"></u-picker>
         <u-picker itemHeight="88" :show="showMerchantType" :columns="merchantTypeList" keyName="dictLabel" @cancel="handleMerchantTypeCancel"
         @confirm="handleMerchantTypeConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+        @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -107,6 +114,8 @@ const showDebitCard = ref(false)
 const title = ref("POS机管理")
 const typeList = ref([])
 const merchantTypeList = ref([])
+const showStatus = ref(false)
+const statusList = ref([])
 const debitCardList = ref([])
 const dateType = ref(1)
 const data = reactive({
@@ -129,12 +138,14 @@ const data = reactive({
     merchantType: null,
     merchantCode: null,
     ratePlus: 0,
-    activationDate: null
+    activationDate: null,
+    status: '1',
+    statusName: '正常使用'
   },
   queryDebitCardParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   // dateType:'1',
@@ -142,6 +153,7 @@ const data = reactive({
           name: [{ type: 'string', required: true, message: 'POS机名称不能为空', trigger: ['change', 'blur'] }],
           typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
           merchantName: [{ type: 'string', required: true, message: '商户名称不能为空', trigger: ['change', 'blur'] }],
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }],  
           rate: [{ type: 'number', required: true, message: '刷卡费率不能为空', trigger: ['change', 'blur'] }],  
           ratePlus: [{ type: 'number', required: true, message: '费率+不能为空', trigger: ['change', 'blur'] }], 
           debitCard: [{ type: 'string', required: true, message: '结算卡不能为空', trigger: ['change', 'blur'] }],  
@@ -174,6 +186,10 @@ onLoad((option) => {
        getDicts('merchant_type').then(res => {
         merchantTypeList.value =[res.data] 
       })
+      // 类型
+      getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
+      })
       if(form.value.id!=null){
         getPosmachine(form.value.id).then(res => {
           form.value = res.data
@@ -185,7 +201,10 @@ onLoad((option) => {
           getDicts('merchant_type').then(result => {
           form.value.merchantTypeName=dictStr(form.value.merchantType, result.data)
       })
-          
+           // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      }) 
         })
       }
   }
@@ -249,6 +268,24 @@ onLoad((option) => {
       function handleMerchantTypeCancel() {
        showMerchantType.value = false
       }
+      function handleShowStatus() {
+        if (statusList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '账户状态操作为空  ', type: 'warning'
+          })
+        } else {
+          showStatus.value = true
+        }
+      }
+      function   handleStatusConfirm(e) {
+        form.value.statusName = e.value[0].dictLabel
+        form.value.status = e.value[0].dictValue
+        showStatus.value = false
+      }
+      function handleStatusCancel() {
+       showStatus.value = false
+      }
+
       function  selectDate(type) {
         dateType.value=type
 				datePickShow.value = true

src/pages/work/base/posmachine/details.vue

@@ -11,6 +11,7 @@
         <u-cell title="POS机名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="支付公司:" titleStyle="font-weight:bolder" :value="detailInfo.payCompany"></u-cell>
         <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="商户名称:" titleStyle="font-weight:bolder" center :value="detailInfo.merchantName"> </u-cell>
         <u-cell title="刷卡费率:" titleStyle="font-weight:bolder" :value="detailInfo.rate"></u-cell>
         <u-cell title="费率+:" titleStyle="font-weight:bolder" :value="detailInfo.ratePlus+''"></u-cell>
@@ -51,6 +52,10 @@ onLoad((option) => {
                            // 类型
             getDicts('merchant_type').then(result => {
          detailInfo.value.merchantType=dictStr(detailInfo.value.merchantType, result.data)
+      })
+       // 类型
+       getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
       })
         })
   }

src/pages/work/base/posmachine/list.vue

@@ -25,6 +25,10 @@
             <text class="row-label">类型：</text>
             <text class="row-value">{{ dictStr(item.type, posTypeList) }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">刷卡费率：</text>
             <text class="row-value">{{ item.rate+'+'+ item.ratePlus}}</text>
@@ -67,6 +71,7 @@ const posTypeList = ref([])
 const merchantTypeList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const statusList = ref([])
 const data = reactive({
   filterPanel: false,
   queryParams: {
@@ -110,6 +115,10 @@ function getList() {
       })
     }
 function   getDict() {
+    // 账户状态
+    getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
       // 类型
       getDicts('pos_type').then(res => {
         posTypeList.value = res.data

src/pages/work/base/stocks/addEdit.vue

@@ -20,6 +20,11 @@
               <u--input v-model="form.code"  placeholder="请填写账号"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
+            <u-form-item label="账户状态" required prop="statusName"  @click="handleShowStatus">
+              <u--input v-model="form.statusName" disabled disabledColor="#ffffff" placeholder="请选择账户状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
             <u-form-item label="密码" prop="password"  >
               <u--input v-model="form.password"  placeholder="请填写密码"
                 inputAlign="right" border="none"></u--input>
@@ -51,6 +56,8 @@
       <u-toast ref="uToast"></u-toast>
       <u-picker itemHeight="88" :show="showDebitCard" :columns="debitCardList" keyName="nameCodeAvailableLimit" @cancel="handleDebitCardCancel"
       @confirm="handleDebitCardConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showStatus" :columns="statusList" keyName="dictLabel" @cancel="handleStatusCancel"
+      @confirm="handleStatusConfirm"></u-picker>
         <u-datetime-picker
 			:show="datePickShow"
 			mode="date"
@@ -65,6 +72,7 @@
   <script setup>
 import { getFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
   import { listAccounts } from '@/api/invest/accounts'
+      import { getDicts } from '@/api/system/dict/data.js'
   const { proxy } = getCurrentInstance()
   import dayjs from 'dayjs'
   import {onLoad,onReady} from "@dcloudio/uni-app";
@@ -75,6 +83,8 @@ const showDebitCard = ref(false)
 const title = ref("股票账户管理")
 const debitCardList = ref([])
 const dateType = ref(1)
+const showStatus = ref(false)
+const statusList = ref([])
 const data = reactive({
   form: {
     id: null,
@@ -94,18 +104,21 @@ const data = reactive({
     updateBy: null,
     updateTime: null,
     delFlag: null,
-    remark: null
+    remark: null,
+    status: '1',
+    statusName: '正常使用'
   },
   queryDebitCardParams: {
     pageNum: 1,
     type: '1',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   // dateType:'1',
   rules: {
           name: [{ type: 'string', required: true, message: '股票账户名称不能为空', trigger: ['change', 'blur'] }],
           code: [{ type: 'string', required: true, message: '账号不能为空', trigger: ['change', 'blur'] }],
+          statusName: [{ type: 'string', required: true, message: '账户状态不能为空', trigger: ['change', 'blur'] }], 
   }
 })
 const { form, queryDebitCardParams, rules} = toRefs(data)
@@ -124,6 +137,10 @@ onLoad((option) => {
     form.value.effectiveDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
   })
   function  getDict() {
+     // 类型
+     getDicts('account_status').then(res => {
+        statusList.value =[res.data] 
+      })
         // 类型
         listAccounts(queryDebitCardParams.value).then((response) => {
        debitCardList.value = [response.rows] 
@@ -132,10 +149,22 @@ onLoad((option) => {
       if(form.value.id!=null){
         getFutureStocks(form.value.id).then(res => {
           form.value = res.data
+          // 类型
+       getDicts('account_status').then(result => {
+          form.value.statusName=dictStr(form.value.status, result.data)
+      })
         })
       }
   }
-
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
     function handleDebitCard() {
         if (debitCardList.value[0].length === 0) {
           proxy.$refs['uToast'].show({

src/pages/work/base/stocks/details.vue

@@ -10,6 +10,7 @@
         <u-cell-group>
         <u-cell title="名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
         <u-cell title="账号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="账户状态:" titleStyle="font-weight:bolder" :value="detailInfo.status"></u-cell>
         <u-cell title="手续费:" titleStyle="font-weight:bolder" center :value="detailInfo.commission"> </u-cell>
         <u-cell title="关联储蓄卡:" titleStyle="font-weight:bolder" :value="detailInfo.bankNameCode"></u-cell>
         <u-cell title="开户日期:" titleStyle="font-weight:bolder" :value="detailInfo.activationDate"></u-cell>
@@ -22,6 +23,7 @@
   
 <script setup>
 import {  getFutureStocks } from '@/api/invest/futureStocks'
+import { getDicts } from '@/api/system/dict/data.js'
 import {onLoad} from "@dcloudio/uni-app";
 import {reactive ,toRefs,ref,computed }from "vue";
 const id = ref('')
@@ -36,6 +38,10 @@ onLoad((option) => {
   function getInfo() {
     getFutureStocks(id.value).then(res => {
           detailInfo.value = res.data
+           // 类型
+           getDicts('account_status').then(result => {
+         detailInfo.value.status=dictStr(detailInfo.value.status, result.data)
+      })
         })
   }
   function dictStr(val, arr) {

src/pages/work/base/stocks/list.vue

@@ -16,6 +16,10 @@
             <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
               :text="item.name+'-'+item.code " size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
+          <view class="item-row">
+            <text class="row-label">账户状态：</text>
+            <text class="row-value">{{ dictStr(item.status, statusList) }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">关联储蓄卡：</text>
             <text class="row-value">{{ item.bankNameCode }}</text>
@@ -51,6 +55,7 @@
 <script setup>
 import { listFutureStocks, delFutureStocks} from '@/api/invest/futureStocks'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import { getDicts } from '@/api/system/dict/data.js'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -59,6 +64,7 @@ const isShow = ref(false)
 const status = ref('loadmore')
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const statusList = ref([])
 const data = reactive({
   queryParams: {
     name: null,
@@ -70,6 +76,10 @@ const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
+   // 账户状态
+   getDicts('account_status').then(res => {
+        statusList.value = res.data
+      })
     getList()
   });
 

src/pages/work/bill/creditCardBill/addEdit.vue

@@ -89,7 +89,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+    status: '1',
     pageSize: 1000
   },
   rules: {

src/pages/work/bill/creditCardBill/list.vue

@@ -92,7 +92,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+    status: '1',
     pageSize: 100
   },
   queryParams: {

src/pages/work/bill/creditInstallmentHistory/addEdit.vue

@@ -134,7 +134,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/bill/creditInstallmentHistory/list.vue

@@ -127,7 +127,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '2',
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/bill/futuresBill/addEdit.vue

@@ -85,6 +85,7 @@ const data = reactive({
   queryFutureStocksListParams: {
     pageNum: 1,
     type: '1',
+    status: '1',
     pageSize: 1000
   },
   rules: {

src/pages/work/bill/futuresBill/list.vue

@@ -67,6 +67,7 @@ const data = reactive({
   queryFutureStocksListParams: {
     pageNum: 1,
     type: '1',
+    status: '1',
     pageSize: 100
   },
   queryParams: {

src/pages/work/bill/onlineLendHistory/addEdit.vue

@@ -134,7 +134,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '3',
-    state: '1',
+   status: '1', 
     pageSize: 1000
   },
   rules: {

src/pages/work/bill/onlineLendHistory/list.vue

@@ -127,7 +127,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '3',
-    state: '1',
+   status: '1', 
     pageSize: 100
   },
   queryParams: {

src/pages/work/bill/peopleLendHistory/addEdit.vue

@@ -113,6 +113,7 @@ const data = reactive({
   queryBankCardLendParams: {
     pageNum: 1,
     type: '3',
+    status: '1',
     lendType: '2',
     pageSize: 1000
   },

src/pages/work/bill/peopleLendHistory/list.vue

@@ -95,6 +95,7 @@ const data = reactive({
     pageNum: 1,
     type: '3',
     lendType: '2',
+    status: '1',
     pageSize: 100
   },
   queryParams: {

src/pages/work/bill/stocksBill/addEdit.vue

@@ -85,6 +85,7 @@ const data = reactive({
   queryFutureStocksListParams: {
     pageNum: 1,
     type: '2',
+    status: '1',
     pageSize: 1000
   },
   rules: {

src/pages/work/bill/stocksBill/list.vue

@@ -67,6 +67,7 @@ const data = reactive({
   queryFutureStocksListParams: {
     pageNum: 1,
     type: '2',
+    status: '1',
     pageSize: 100
   },
   queryParams: {