借款申请更改

src/views/expense/loanRequest/index.vue

@@ -3,60 +3,68 @@
         <template #header>
             <div class="w-36">
                 <el-select v-model="searchForm.loanUserName" block clearable placeholder="申请人" size="large">
-                    <el-option v-for="item in loanuserList" :label="item" :value="item"/>
+                    <el-option v-for="item in loanuserList" :label="item" :value="item" />
                 </el-select>
             </div>
             <div class="ml-4">
-                <el-button type="primary" @click="searchClick" size="large">
-                    <HcIcon name="search-2"/>
+                <el-button type="primary" size="large" @click="searchClick">
+                    <HcIcon name="search-2" />
                     <span>搜索</span>
                 </el-button>
             </div>
             <div class="ml-2">
                 <el-button size="large" @click="resetClick">
-                    <HcIcon name="close-circle"/>
+                    <HcIcon name="close-circle" />
                     <span>重置</span>
                 </el-button>
             </div>
         </template>
         <template #extra>
             <el-button size="large" type="warning" hc-btn @click="draftsClick">
-                <HcIcon name="draft"/>
-                <span>草稿箱{{draftNum > 0 ? `(${draftNum})` : ''}}</span>
+                <HcIcon name="draft" />
+                <span>草稿箱{{ draftNum > 0 ? `(${draftNum})` : '' }}</span>
             </el-button>
             <el-button size="large" type="primary" hc-btn @click="addRowClick">
-                <HcIcon name="add"/>
+                <HcIcon name="add" />
                 <span>新增借款申请</span>
             </el-button>
         </template>
 
         <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading">
-            <template #action="{row,index}">
+            <template #action="{ row, index }">
                 <el-popconfirm title="是否确认撤销?" hide-icon @confirm="rowCancel(row)">
                     <template #reference>
-                        <el-button size="small" type="primary"
-                                   :disabled="row.status !== 1"
-                                   :loading="row.isCancelLoading"
-                        >撤销</el-button>
+                        <el-button
+                            size="small" type="primary"
+                            :disabled="row.status !== 1"
+                            :loading="row.isCancelLoading"
+                        >
+                            撤销
+                        </el-button>
                     </template>
                 </el-popconfirm>
             </template>
         </HcTable>
 
         <template #action>
-            <HcPages :pages="searchForm" @change="pageChange"/>
+            <HcPages :pages="searchForm" @change="pageChange" />
         </template>
 
-        <!--草稿箱-->
-        <HcDialog isToBody isTable bgColor="#ffffff" widths="62rem" :footer="false" :show="draftsModal"
-                  :title="draftNum > 0 ? `草稿箱(${draftNum})` : '草稿箱'" @close="draftsCloseClick"
+        <!-- 草稿箱 -->
+        <HcDialog
+            is-to-body is-table bg-color="#ffffff" widths="62rem" :footer="false" :show="draftsModal"
+            :title="draftNum > 0 ? `草稿箱(${draftNum})` : '草稿箱'" @close="draftsCloseClick"
         >
             <el-alert title="3个月内未更新的草稿将被自动删除" type="warning" show-icon />
             <div style="position: relative;height: calc(100% - 44px);">
-                <HcTable :isIndex="false" :column="tableDraftsColumn" :datas="tableDraftsData">
-                    <template #action="{row,index}">
-                        <el-button size="small" type="primary" @click="editDraftClick(row)">继续编辑</el-button>
-                        <el-button size="small" type="danger" @click="delDraftClick(row)">删除</el-button>
+                <HcTable :is-index="false" :column="tableDraftsColumn" :datas="tableDraftsData">
+                    <template #action="{ row, index }">
+                        <el-button size="small" type="primary" @click="editDraftClick(row)">
+                            继续编辑
+                        </el-button>
+                        <el-button size="small" type="danger" @click="delDraftClick(row)">
+                            删除
+                        </el-button>
                     </template>
                 </HcTable>
             </div>
@@ -65,11 +73,11 @@
 </template>
 
 <script setup>
-import {onActivated, ref} from "vue";
-import {useRouter} from 'vue-router'
-import mainApi from "~api/expense/loanRequest";
-import {getArrValue} from "js-fast-way";
-import {delMessage} from "~uti/tools";
+import { onActivated, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import mainApi from '~api/expense/loanRequest'
+import { getArrValue } from 'js-fast-way'
+import { delMessage } from '~uti/tools'
 
 const router = useRouter()
 
@@ -84,21 +92,21 @@ const getApi = () => {
 }
 
 //搜索表单
-const searchForm = ref({loanUserName: null, current: 1, size: 20, total: 0})
+const searchForm = ref({ loanUserName: null, current: 1, size: 20, total: 0 })
 
 //搜索
 const searchClick = () => {
-    searchForm.value.current = 1;
+    searchForm.value.current = 1
     getTableData()
 }
 
 //重置搜索表单
 const resetClick = () => {
-    searchForm.value = {current: 1, size: 20, total: 0}
+    searchForm.value = { current: 1, size: 20, total: 0 }
 }
 
 //分页被点击
-const pageChange = ({current, size}) => {
+const pageChange = ({ current, size }) => {
     searchForm.value.current = current
     searchForm.value.size = size
     getTableData()
@@ -107,22 +115,22 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'loanUserName', name: '申请人', width: '140'},
-    {key: 'loanDesc', name: '借款事由', minWidth: '200'},
-    {key: 'loanMoney', name: '申请金额', width: '160', align: 'center'},
-    {key: 'useReturnDate', name: '使用日期-归还期', width: '160', align: 'center'},
-    {key: 'returnStatus', name: '还款状态', width: '140', align: 'center'},
-    {key: 'remarks', name: '备注', minWidth: '200', align: 'center'},
-    {key: 'approvalResultName', name: '审批结果', width: '160', align: 'center'},
-    {key: 'approvalStatusName', name: '审批状态', width: '140', align: 'center'},
-    {key: 'createName', name: '创建人', width: '140', align: 'center'},
-    {key: 'createTime', name: '创建时间', width: '160', align: 'center'},
-    {key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right'},
+    { key: 'loanUserName', name: '申请人', width: '140' },
+    { key: 'loanDesc', name: '借款事由', minWidth: '200' },
+    { key: 'loanMoney', name: '申请金额', width: '160', align: 'center' },
+    { key: 'useReturnDate', name: '使用日期-归还日期', width: '160', align: 'center' },
+    { key: 'returnStatus', name: '还款状态', width: '140', align: 'center' },
+    { key: 'remarks', name: '备注', minWidth: '200', align: 'center' },
+    { key: 'approvalResultName', name: '审批结果', width: '160', align: 'center' },
+    { key: 'approvalStatusName', name: '审批状态', width: '140', align: 'center' },
+    { key: 'createName', name: '创建人', width: '140', align: 'center' },
+    { key: 'createTime', name: '创建时间', width: '160', align: 'center' },
+    { key: 'action', name: '操作', width: '90', align: 'center', fixed: 'right' },
 ]
 const tableData = ref([])
 const getTableData = async () => {
     tableLoading.value = true
-    const {error, code, data} = await mainApi.page(searchForm.value)
+    const { error, code, data } = await mainApi.page(searchForm.value)
     //判断状态
     tableLoading.value = false
     if (!error && code === 200) {
@@ -137,7 +145,7 @@ const getTableData = async () => {
 //撤销
 const rowCancel = async (row) => {
     row.isCancelLoading = true
-    const {error, code, msg} = await mainApi.cancel({id: row.id})
+    const { error, code, msg } = await mainApi.cancel({ id: row.id })
     //判断状态
     row.isCancelLoading = false
     if (!error && code === 200) {
@@ -152,7 +160,7 @@ const rowCancel = async (row) => {
 //新增
 const addRowClick = () => {
     router.push({
-        name: 'expense-loanRequest-record'
+        name: 'expense-loanRequest-record',
     })
 }
 
@@ -168,14 +176,14 @@ const draftsCloseClick = () => {
 //草稿箱数据
 const draftNum = ref(0)
 const tableDraftsColumn = [
-    {key: 'title', name: '标题'},
-    {key: 'updateTime', name: '更新时间', width: '200'},
-    {key: 'action', name: '操作', width: '170', align: 'center'},
+    { key: 'title', name: '标题' },
+    { key: 'updateTime', name: '更新时间', width: '200' },
+    { key: 'action', name: '操作', width: '170', align: 'center' },
 ]
 const tableDraftsData = ref([])
 //获取草稿数量
 const getDraftNum = async () => {
-    const {error, code, data} = await mainApi.draft()
+    const { error, code, data } = await mainApi.draft()
     //判断状态
     if (!error && code === 200) {
         const res = getArrValue(data)
@@ -187,9 +195,9 @@ const getDraftNum = async () => {
     }
 }
 //获取借款申请人
-const loanuserList=ref([])
-const getLoanUserList=async()=>{
-    const {error, code, data} = await mainApi.getLoanUserNameList()
+const loanuserList = ref([])
+const getLoanUserList = async ()=>{
+    const { error, code, data } = await mainApi.getLoanUserNameList()
     if (!error && code === 200) {
         loanuserList.value = getArrValue(data)
 
@@ -199,18 +207,18 @@ const getLoanUserList=async()=>{
     }
 }
 //继续编辑
-const editDraftClick = ({id}) => {
+const editDraftClick = ({ id }) => {
     draftsModal.value = false
     router.push({
         name: 'expense-loanRequest-record',
-        query: {id: id}
+        query: { id: id },
     })
 }
 
 //删除草稿
-const delDraftClick = ({id}) => {
+const delDraftClick = ({ id }) => {
     delMessage(async () => {
-        const {error, code, msg} = await mainApi.remove({id})
+        const { error, code, msg } = await mainApi.remove({ id })
         //判断状态
         if (!error && code === 200) {
             window.$message?.success(msg)

src/views/expense/loanRequest/record.vue

@@ -10,7 +10,10 @@
                 <el-scrollbar>
                     <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" size="large">
                         <el-form-item label="申请人：" prop="loanUserName">
-                            <el-input v-model="formModel.loanUserName" />
+                            <!-- <el-input v-model="formModel.loanUserName" /> -->
+                            <el-select v-model="formModel.loanUserName" block clearable placeholder="申请人" size="large">
+                                <el-option v-for="item in loanuserList" :label="item" :value="item" />
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="借款事由：">
                             <el-input v-model="formModel.loanDesc" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" />
@@ -90,7 +93,7 @@ import { onActivated, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import mainApi from '~api/expense/loanRequest'
 import { getApprovesList, getNumberToChinese } from '~api/other'
-import { deepClone, formValidate, getObjValue } from 'js-fast-way'
+import { deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
 
 //初始变量
 const router = useRouter()
@@ -107,8 +110,9 @@ onActivated(() => {
 
 //请求接口
 const getApi = () => {
-    //清空流程数据
+    //流程数据
     getApprovesListData()
+    getLoanUserNameList()
     //获取数据详情
     if (dataId.value > 0) {
         getDetailsData()
@@ -215,6 +219,19 @@ const getApprovesListData = async ()=>{
     }
 
 }
+//获取借款申请人列表
+const loanuserList = ref([])
+const getLoanUserNameList = async () => {
+    const { error, code, data } = await mainApi.getLoanUserNameList({})
+    //判断状态
+    if (!error && code === 200) {
+        const res = getArrValue(data)
+        loanuserList.value = res
+       
+    } else {
+        loanuserList.value = []
+    }
+}
 //处理表单数据
 const getFormData = (submitStatus = 1) => {
     const res = deepClone(formModel.value)