借款申请

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

@@ -0,0 +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" >
+                <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"/>
+            </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>
+        </div>
+        <el-form-item label="备注：">
+            <el-input type="textarea" v-model="otherInfo.remarks" :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()
+ })
+//参数
+const props = defineProps({
+  otherInfo: {
+    type: Object,
+    default: {}
+  }
+})
+const trafficTypeData=ref([])
+const wayType=ref([])
+const cityType=ref([])
+const projectType=ref([])
+const partneroptions=ref([])
+//监听
+watch(() => [
+  props.otherInfo,
+], ([otherInfo]) => {
+  console.log(otherInfo, 'otherInfo');
+
+})
+const getProjectData = async () => {
+    const {error, code, data} = await getProjectList()
+    //判断状态
+    if (!error && code === 200) {
+      projectType.value = getArrValue(data)
+    } else {
+      projectType.value = []
+    }
+}
+
+</script>
+<style lang='scss' scoped>
+</style>

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

@@ -2,7 +2,7 @@
  <template>
        <div class="record-form-box">
                 <el-scrollbar>
-                    <el-form ref="formRef" :model="otherInfo" label-position="top" size="large" disabled>
+                    <el-form ref="formRef" :model="otherInfo" label-position="top"  disabled>
                       <div class="hc-form-item">
                         <el-form-item label="申请时间：" prop="afDate">
                             <el-date-picker type="date" class="block" v-model="otherInfo.afDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
@@ -22,7 +22,7 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="是否为项目提成申请：" prop="isProjectBonus">
-                                <el-select block v-model="otherInfo.isProjectBonus">
+                                <el-select block v-model="otherInfo.isProjectBonus" placeholder="">
                                     <el-option label="否" :value="0"/>
                                     <el-option label="是" :value="1"/>
                                 </el-select>

src/views/home/task/components/trip-info.vue

@@ -1,37 +1,37 @@
 <!--  -->
 <template>
   <div>
-    <el-form ref="formRef" :model="otherInfo" label-width="auto" size="large" disabled>
+    <el-form ref="formRef" :model="otherInfo" label-width="auto" disabled label-position="top">
       <div class="project-form-top">
         <el-form-item label="出差事由：" prop="tripDesc">
           <el-input v-model="otherInfo.tripDesc" />
         </el-form-item>
         <el-form-item label="交通工具" prop="trafficType">
-          <el-select v-model="otherInfo.trafficType" block clearable placeholder="请选择">
+          <el-select v-model="otherInfo.trafficType" block clearable >
             <el-option v-for="item in trafficTypeData" :label="item.dictName" :value="item.dictValue" />
           </el-select>
         </el-form-item>
         <el-form-item label="单程往返" prop="isSingletonType">
-          <el-select v-model="otherInfo.isSingletonType" block clearable placeholder="请选择">
+          <el-select v-model="otherInfo.isSingletonType" block clearable >
             <el-option v-for="item in wayType" :label="item.name" :value="item.key" />
           </el-select>
         </el-form-item>
         <el-form-item label="出发城市" prop="startCity">
-          <el-select v-model="otherInfo.startCity" block clearable placeholder="请选择出发城市">
+          <el-select v-model="otherInfo.startCity" block clearable>
             <el-option v-for="item in cityType" :label="item.name" :value="item.key" />
           </el-select>
         </el-form-item>
         <el-form-item label="目的城市" prop="endCity">
-          <el-select v-model="otherInfo.endCity" block clearable placeholder="请选择目的城市">
+          <el-select v-model="otherInfo.endCity" block clearable >
             <el-option v-for="item in cityType" :label="item.name" :value="item.key" />
           </el-select>
         </el-form-item>
         <el-form-item label="开始时间">
-          <el-date-picker v-model="otherInfo.startDate" type="date" placeholder="请选择开始时间" style="width: 100%;"
+          <el-date-picker v-model="otherInfo.startDate" type="date"  style="width: 100%;"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
         </el-form-item>
         <el-form-item label="结束时间">
-          <el-date-picker v-model="otherInfo.endDate" type="date" placeholder="请选择结束时间" style="width: 100%;"
+          <el-date-picker v-model="otherInfo.endDate" type="date"  style="width: 100%;"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
         </el-form-item>
         <el-form-item label="时长" prop="duration">
@@ -44,12 +44,12 @@
           <el-input v-model="otherInfo.remarks" type="textarea" />
         </el-form-item>
         <el-form-item label="同行人" prop="fellowTravelerUserIds">
-          <el-select v-model="otherInfo.fellowTravelerUserIds" block clearable placeholder="请选择" style="width: 100%">
+          <el-select v-model="otherInfo.fellowTravelerUserIds" block clearable style="width: 100%">
             <el-option v-for="item in partneroptions" :key="item.key" :label="item.name" :value="item.key" />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属项目" prop="projectId" placeholder="请选择同行人">
-          <el-select v-model="otherInfo.projectId" block clearable placeholder="请选择">
+        <el-form-item label="所属项目" prop="projectId" >
+          <el-select v-model="otherInfo.projectId" block clearable>
             <el-option v-for="item in projectType" :label="item.projectName" :value="item.projectId" />
           </el-select>
         </el-form-item>
@@ -68,9 +68,7 @@
 import { ref, watch,onActivated } from 'vue'
 import {getProjectList} from "~api/other";
 import {getArrValue} from "js-fast-way";
-onActivated(()=>{
-  getProjectData()
- })
+
 //参数
 const props = defineProps({
   otherInfo: {
@@ -88,6 +86,7 @@ watch(() => [
   props.otherInfo,
 ], ([otherInfo]) => {
   console.log(otherInfo, 'otherInfo');
+  getProjectData()
 
 })
 const getProjectData = async () => {

src/views/home/task/task-details.vue

@@ -87,7 +87,10 @@
             <div class="hc-info-list" v-if="dataType==='支付申请'">
                 <paymentRequest :other-info="otherInfo"/>
             </div>
-          
+              <!-- 借款申请 -->
+             <div class="hc-info-list" v-if="dataType==='借款审批'">
+                <loanRequest :other-info="otherInfo"/>
+            </div>
           
         </HcCardItem>
   
@@ -122,7 +125,7 @@
                     <el-option label="财务报销" value="报销审批"/>
                     <el-option label="采购" value="3"/>
                     <el-option label="外包支付" value="4"/>
-                    <el-option label="借款审批" value="5"/>
+                    <el-option label="借款审批" value="借款审批"/>
                     <el-option label="出差审批" value="出差审批"/>
                     <el-option label="支付申请" value="支付申请"/>
                 </el-select>
@@ -146,8 +149,10 @@ import {onActivated, ref} from "vue";
 import {useRouter, useRoute} from 'vue-router'
 import taskApi from '~api/home/task.js';
 import {getArrValue,getObjValue} from "js-fast-way"
-import tripInfo from './components/trip-info.vue'
+import tripInfo from './components/trip-info.vue'//出差申请
 import paymentRequest from './components/pay-request.vue'
+import loanRequest from './components/loan-request.vue'
+
 
 //初始变量
 const router = useRouter()