借款申请修改

src/views/expense/loanRequest/record.vue

@@ -10,9 +10,8 @@
                 <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-select v-model="formModel.loanUserName" block clearable placeholder="申请人" size="large">
-                                <el-option v-for="item in loanuserList" :label="item" :value="item" />
+                            <el-select v-model="formModel.loanUserName" clearable>
+                                <el-option v-for="item in userList" :label="item.name" :value="item.name" />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="借款事由：">
@@ -92,8 +91,10 @@
 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 { getApprovesList, getNumberToChinese, getuserList } from '~api/other'
 import { deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
+import { useAppStore } from '~src/store'
+const useAppState = useAppStore()
 
 //初始变量
 const router = useRouter()
@@ -112,7 +113,7 @@ onActivated(() => {
 const getApi = () => {
     //流程数据
     getApprovesListData()
-    getLoanUserNameList()
+    getUserDict()
     //获取数据详情
     if (dataId.value > 0) {
         getDetailsData()
@@ -219,17 +220,17 @@ const getApprovesListData = async ()=>{
     }
 
 }
-//获取借款申请人列表
-const loanuserList = ref([])
-const getLoanUserNameList = async () => {
-    const { error, code, data } = await mainApi.getLoanUserNameList({})
-    //判断状态
+
+//获取所有员工
+const userList = ref([])
+const getUserDict = async ()=>{
+    const { error, code, data } = await getuserList({ tenantId:useAppState.tenantId })
     if (!error && code === 200) {
-        const res = getArrValue(data)
-        loanuserList.value = res
-       
+        userList.value = getArrValue(data)
+
     } else {
-        loanuserList.value = []
+        userList.value = []
+
     }
 }
 //处理表单数据

src/views/home/task/components/loan-request.vue

@@ -1,65 +1,73 @@
 <!--  -->
 <template>
-  <div >
-    <el-form ref="formRef" :model="otherInfo"  label-position="top"   disabled>
-        <el-form-item label="申请人：" prop="loanUserName">
-            <el-input v-model="otherInfo.loanUserName"/>
-        </el-form-item>
-        <el-form-item label="借款事由：">
-            <el-input type="textarea" v-model="otherInfo.loanDesc" :autosize="{ minRows: 3, maxRows: 5 }"/>
-        </el-form-item>
-        <el-form-item prop="loanMoney">
-            <template #label>
-                <span>申请金额：</span>
-                <span style="color: #8f8d8d;">{{otherInfo.loanMoneyText}}</span>
-            </template>
-            <el-input v-model="otherInfo.loanMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
-                <template #append>元</template>
-            </el-input>
-        </el-form-item>
-        <div class="hc-form-item">
-            <el-form-item label="使用日期：" prop="useDate">
-                <el-date-picker type="date" class="block" v-model="otherInfo.useDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+    <div>
+        <el-form ref="formRef" :model="otherInfo" label-position="top" disabled>
+            <el-form-item label="申请人：" prop="loanUserName">
+                <!-- <el-input v-model="otherInfo.loanUserName"/> -->
+                <el-select v-model="otherInfo.loanUserName" clearable>
+                    <el-option v-for="item in userList" :label="item.name" :value="item.name" />
+                </el-select>
             </el-form-item>
-            <el-form-item label="归还日期：" prop="returnDate">
-                <el-date-picker type="date" class="block" v-model="otherInfo.returnDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+            <el-form-item label="借款事由：">
+                <el-input v-model="otherInfo.loanDesc" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" />
             </el-form-item>
-        </div>
-        <el-form-item label="备注：">
-            <el-input type="textarea" v-model="otherInfo.remarks" :autosize="{ minRows: 3, maxRows: 5 }"/>
-        </el-form-item>
-    </el-form>
-  </div>
+            <el-form-item prop="loanMoney">
+                <template #label>
+                    <span>申请金额：</span>
+                    <span style="color: #8f8d8d;">{{ otherInfo.loanMoneyText }}</span>
+                </template>
+                <el-input v-model="otherInfo.loanMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)">
+                    <template #append>
+                        元
+                    </template>
+                </el-input>
+            </el-form-item>
+            <div class="hc-form-item">
+                <el-form-item label="使用日期：" prop="useDate">
+                    <el-date-picker v-model="otherInfo.useDate" type="date" class="block" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                </el-form-item>
+                <el-form-item label="归还日期：" prop="returnDate">
+                    <el-date-picker v-model="otherInfo.returnDate" type="date" class="block" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+                </el-form-item>
+            </div>
+            <el-form-item label="备注：">
+                <el-input v-model="otherInfo.remarks" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" />
+            </el-form-item>
+        </el-form>
+    </div>
 </template>
 
 <script setup>
-import { ref, watch,onActivated } from 'vue'
-import {getProjectList} from "~api/other";
-import {getArrValue} from "js-fast-way";
-onActivated(()=>{
-  getProjectData()
- })
+import { onActivated, ref, watch } from 'vue'
+import { getProjectList, getuserList } from '~api/other'
+import { getArrValue } from 'js-fast-way'
+import { useAppStore } from '~src/store'
 //参数
 const props = defineProps({
   otherInfo: {
     type: Object,
-    default: {}
-  }
+    default: {},
+  },
 })
-const trafficTypeData=ref([])
-const wayType=ref([])
-const cityType=ref([])
-const projectType=ref([])
-const partneroptions=ref([])
+const useAppState = useAppStore()
+onActivated(()=>{
+  getProjectData()
+  getUserDict()
+ })
+const trafficTypeData = ref([])
+const wayType = ref([])
+const cityType = ref([])
+const projectType = ref([])
+const partneroptions = ref([])
 //监听
 watch(() => [
   props.otherInfo,
 ], ([otherInfo]) => {
-  console.log(otherInfo, 'otherInfo');
+  console.log(otherInfo, 'otherInfo')
 
 })
 const getProjectData = async () => {
-    const {error, code, data} = await getProjectList()
+    const { error, code, data } = await getProjectList()
     //判断状态
     if (!error && code === 200) {
       projectType.value = getArrValue(data)
@@ -67,7 +75,19 @@ const getProjectData = async () => {
       projectType.value = []
     }
 }
+//获取所有员工
+const userList = ref([])
+const getUserDict = async ()=>{
+    const { error, code, data } = await getuserList({ tenantId:useAppState.tenantId })
+    if (!error && code === 200) {
+        userList.value = getArrValue(data)
+
+    } else {
+        userList.value = []
 
+    }
+}
 </script>
+
 <style lang='scss' scoped>
 </style>