Merge remote-tracking branch 'origin/master'

src/api/modules/expense/loanRequest.js

@@ -49,4 +49,12 @@ export default {
             params: form
         }, msg);
     },
+    //获取借款人申请列表
+    async getLoanUserNameList(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/ex/ma/getLoanUserNameList',
+            method: 'get',
+            params: form
+        }, msg);
+    },
 }

src/api/modules/expense/paymentRequest.js

@@ -56,5 +56,13 @@ export default {
             method: 'get',
             params: form
         }, msg);
-    }
+    },
+    //获取支付收款人列表
+    async getPayeeUserNameList(form, msg = false) {
+        return httpApi({
+            url: '/api/blade-control/ex/ma/getPayeeUserNameList',
+            method: 'get',
+            params: form
+        }, msg);
+    },
 }

src/views/expense/finReimburse/index.vue

@@ -3,8 +3,7 @@
         <template #header>
             <div class="w-36">
                 <el-select v-model="searchForm.userIdVesting" block clearable placeholder="归属人" size="large">
-                    <el-option label="暂无接口1" value="1"/>
-                    <el-option label="暂无接口2" value="2"/>
+                    <el-option v-for="item in userList" :label="item.name" :value="item.id"/>
                 </el-select>
             </div>
             <div class="w-72 ml-2">
@@ -77,9 +76,11 @@
 import {onActivated, ref} from "vue";
 import {useRouter} from 'vue-router'
 import mainApi from "~api/expense/finReimburse";
-import {getProjectList} from "~api/other";
+import {getProjectList,getuserList} from "~api/other";
 import {getArrValue} from "js-fast-way";
 import {delMessage} from "~uti/tools";
+import {useAppStore} from "~src/store";
+const useAppState = useAppStore();
 
 const router = useRouter()
 
@@ -91,6 +92,7 @@ const getApi = () => {
     getProjectData()
     getTableData()
     getDraftNum()
+    getUserDict()
 }
 
 
@@ -105,7 +107,18 @@ 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 = []
 
+    }
+}
 //搜索表单
 const searchForm = ref({userIdVesting: null, projectId: null, current: 1, size: 20, total: 0})
 
@@ -118,6 +131,7 @@ const searchClick = () => {
 //重置搜索表单
 const resetClick = () => {
     searchForm.value = {current: 1, size: 20, total: 0}
+    getTableData()
 }
 
 //分页被点击

src/views/expense/finReimburse/record.vue

@@ -71,8 +71,7 @@
                         <el-form class="mt-16" inline :model="detailsData" label-position="top">
                             <el-form-item label="归属人">
                                 <el-select v-model="detailsData.userIdVesting">
-                                    <el-option label="暂无接口1" value="1" />
-                                    <el-option label="暂无接口2" value="2" />
+                                    <el-option v-for="item in userList" :label="item.name" :value="item.id"/>
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="是否抵消借款金额">
@@ -152,8 +151,10 @@ import {useRoute, useRouter} from 'vue-router'
 import mainApi from "~api/expense/finReimburse";
 import {getTokenHeader} from "~src/api/request/header";
 import {arrIndex, deepClone, formValidate, getArrValue, getObjValue} from "js-fast-way";
-import {getProjectList, getDictInfo} from "~api/other";
+import {getProjectList, getDictInfo,getuserList} from "~api/other";
 import {delMessage} from "~uti/tools";
+import {useAppStore} from "~src/store";
+const useAppState = useAppStore();
 
 //初始变量
 const router = useRouter()
@@ -176,6 +177,7 @@ const getApi = () => {
     getProjectData()
     expenseFrType()
     getLoanListData()
+    getUserDict()
     //获取数据详情
     if (dataId.value > 0 && dataType.value !== 'add') {
         getDetailsData()
@@ -223,7 +225,18 @@ const getLoanListData = async () => {
         loanListData.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 = []
 
+    }
+}
 
 //基础详情
 const detailsObj = {

src/views/expense/loanRequest/index.vue

@@ -2,9 +2,8 @@
     <HcCard>
         <template #header>
             <div class="w-36">
-                <el-select v-model="searchForm.user" block clearable placeholder="申请人" size="large">
-                    <el-option label="暂无接口1" value="1"/>
-                    <el-option label="暂无接口2" value="2"/>
+                <el-select v-model="searchForm.loanUserName" block clearable placeholder="申请人" size="large">
+                    <el-option v-for="item in loanuserList" :label="item" :value="item"/>
                 </el-select>
             </div>
             <div class="ml-4">
@@ -81,10 +80,11 @@ onActivated(() => {
 const getApi = () => {
     getTableData()
     getDraftNum()
+    getLoanUserList()
 }
 
 //搜索表单
-const searchForm = ref({user: null, current: 1, size: 20, total: 0})
+const searchForm = ref({loanUserName: null, current: 1, size: 20, total: 0})
 
 //搜索
 const searchClick = () => {
@@ -186,7 +186,18 @@ const getDraftNum = async () => {
         draftNum.value = 0
     }
 }
+//获取借款申请人
+const loanuserList=ref([])
+const getLoanUserList=async()=>{
+    const {error, code, data} = await mainApi.getLoanUserNameList()
+    if (!error && code === 200) {
+        loanuserList.value = getArrValue(data)
+
+    } else {
+        loanuserList.value = []
 
+    }
+}
 //继续编辑
 const editDraftClick = ({id}) => {
     draftsModal.value = false

src/views/expense/outsourcing/index.vue

@@ -72,6 +72,7 @@ import {getProjectList} from "~api/other"
 import {getArrValue} from "js-fast-way";
 import {delMessage} from "~uti/tools";
 
+
 const router = useRouter()
 
 onActivated(() => {
@@ -82,6 +83,7 @@ const getApi = () => {
     getProjectData()
     getTableData()
     getDraftNum()
+    getPayeeUserList()
 }
 
 //项目类型

src/views/expense/paymentRequest/index.vue

@@ -3,8 +3,7 @@
         <template #header>
             <div class="w-36">
                 <el-select v-model="searchForm.payeeUserId" block clearable placeholder="收款人" size="large">
-                    <el-option label="暂无接口1" value="1"/>
-                    <el-option label="暂无接口2" value="2"/>
+                    <el-option v-for="item in payeeUserList" :label="item" :value="item"/>
                 </el-select>
             </div>
             <div class="w-72 ml-2">
@@ -88,6 +87,7 @@ const getApi = () => {
     getProjectData()
     getTableData()
     getDraftNum()
+    getPayeeUserList()
 }
 
 //项目类型
@@ -101,7 +101,18 @@ const getProjectData = async () => {
         projectType.value = []
     }
 }
+//获取支付申请人
+const payeeUserList=ref([])
+const getPayeeUserList=async()=>{
+    const {error, code, data} = await mainApi.getPayeeUserNameList()
+    if (!error && code === 200) {
+        payeeUserList.value = getArrValue(data)
+
+    } else {
+        payeeUserList.value = []
 
+    }
+}
 //搜索表单
 const searchForm = ref({payeeUserId: null, projectId: null, current: 1, size: 20, total: 0})
 

src/views/project/contract/components/milestone.vue

@@ -33,7 +33,7 @@
             <template #reminderUserName="{row,index}">
                 <span v-if="isDisabled">{{row.reminderUserName}}</span>
                 <el-select v-model="row.reminderUserName" block  placeholder="请选择" v-else>
-                                        <el-option v-for="item in reminderUserList" :label="item.dictName" :value="item.dictValue"/>
+                                        <el-option v-for="item in reminderUserList" :label="item.name" :value="item.id"/>
                  </el-select>
             </template>
             <template #action="{row,index}">
@@ -65,6 +65,7 @@
 import {ref, watch} from "vue";
 import {useRouter} from 'vue-router'
 
+
 const router = useRouter()
 const emit= defineEmits(['saveClick',"update:datas"])
 
@@ -81,6 +82,10 @@ const props = defineProps({
     saveLoaing:{
         type: Boolean,
         default: false
+    },
+    reminderUserList:{
+        type:Array,
+        default:()=>([])
     }
 })
 
@@ -127,8 +132,6 @@ const tableData = ref([
 const goBackClick = () => {
     router.back()
 }
-//催款执行人reminderUserList
-const reminderUserList=ref([])
 
 const addRow=()=>{
     infoData.value.push({})

src/views/project/contract/form.vue

@@ -7,7 +7,7 @@
             <fileTabCard :datas="infoDataFile" :disabled="dataType === 'view'" v-if="tabsKey === 'file'" @saveClick="saveClick"  :saveLoaing="saveLoaing"/>
         </template>
         <template #tab-milestone>
-            <milestoneTab :datas="milestoneData" :disabled="dataType === 'view'" v-if="tabsKey === 'milestone'" @saveClick="saveClick"  :saveLoaing="saveLoaing"/>
+            <milestoneTab :datas="milestoneData" :disabled="dataType === 'view'" v-if="tabsKey === 'milestone'" @saveClick="saveClick"  :saveLoaing="saveLoaing" :reminderUserList="reminderUserList"/>
         </template>
         <template #tab-record>
             <recordTabCard :datas="recordData" v-if="tabsKey === 'record'"/>
@@ -25,6 +25,9 @@ import milestoneTab from "./components/milestone.vue";
 import recordTabCard from "./components/record.vue";
 import {arrIndex,getObjValue,getArrValue} from "js-fast-way";
 import contractApi from '~api/project/project-contract.js';
+import { getuserList} from "~api/other";
+import {useAppStore} from "~src/store";
+const useAppState = useAppStore();
 
 //初始变量
 const router = useRouter()
@@ -38,6 +41,7 @@ onActivated(() => {
     dataType.value = useRoutes?.query?.type ?? ''
     setTabsData()
     getContractType()
+    getUserDict()
     if(dataType.value!=='add'){
         getContractInfoById()
         getListByContractId()
@@ -174,4 +178,17 @@ const getProjectList=async(type)=>{
         projectList.value=[]
     }
 }
+//催款执行人reminderUserList
+const reminderUserList=ref([])
+//获取部门人员列表
+const getUserDict=async()=>{
+    const {error, code, data} = await getuserList({tenantId:useAppState.tenantId})
+    if (!error && code === 200) {
+        reminderUserList.value = getArrValue(data)
+
+    } else {
+        reminderUserList.value = []
+
+    }
+}
 </script>