移动端借款功能修改

client/src/views/OaSystem/financialManagement/yksqPage/index.vue

@@ -100,12 +100,12 @@
           prop="projectName"
           label="项目名称"
         />
-        <el-table-column
+        <!-- <el-table-column
           show-overflow-tooltip="true"
           align="center"
           prop="projectDeptName"
           label="项目部门"
-        />
+        /> -->
         <el-table-column
           align="center"
           prop="agreedPayTime"
@@ -147,6 +147,7 @@ import moment from 'moment'
 import download from '@/utils/download'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
 import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
+import { DatetimePicker } from 'vant';
 
 defineOptions({ name: 'UseMoney' })
 const queryParams = reactive({
@@ -177,7 +178,8 @@ const infoList: any = ref([
     num: '0'
   }
 ])
-
+const app = createApp();
+app.use(DatetimePicker);
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数

client_h5/src/pages/loan/index.vue

@@ -46,6 +46,25 @@
             @click="showPickerClick"
             :rules="[{ required: true, message: '请选择项目' }]"
           />
+          <van-field
+            v-model="formData.payCompany"
+            is-link
+            readonly
+            name="付款单位"
+            label="付款单位"
+            placeholder="请选择付款单位"
+            @click="showPickerClick1"
+            :rules="[{ required: false, message: '请选择付款单位' }]"
+          />
+          <van-field
+            v-model="formData.agreedPayTime"
+            is-link
+            readonly
+            name="约定付款期限"
+            label="约定付款期限"
+            placeholder="请选择约定付款期限"
+            @click="showPickerClick2"
+          />
           <van-field
             v-model="formData.loanAmount"
             name="借款总金额（元）"
@@ -53,6 +72,13 @@
             placeholder="借款总金额（元）"
             :rules="[{ required: true, message: '请填写借款总金额（元）' }]"
           />
+          <van-field
+            v-model="formData.loadAmountUpper"
+            name="大写借款总金额"
+            label="大写借款总金额"
+            placeholder="大写借款总金额"
+            readonly
+          />
           <van-field
             v-model="formData.description"
             name="借款事由"
@@ -84,6 +110,21 @@
       :columns-field-names="customFieldName"
     />
   </van-popup>
+  <van-popup v-model:show="showPicker1" position="bottom">
+    <van-picker
+      :columns="columns1"
+      @confirm="onConfirm1"
+      @cancel="showPicker1 = false"
+      :columns-field-names="customFieldName1"
+    />
+  </van-popup>
+  <van-popup v-model:show="showPicker2" position="bottom">
+    <van-datetime-picker
+      type="year-month-day"
+      @confirm="onConfirm2"
+      @cancel="showPicker2 = false"
+    />
+  </van-popup>
 </template>
 
 <script setup lang="ts">
@@ -107,6 +148,9 @@ interface FormDataType {
   projectName: string;
   projecId: string;
   bz1: string;
+  payCompanyId: string;
+  payCompany: string;
+  agreedPayTime: string;
 }
 const formData = ref<FormDataType>({
   instanceId: "",
@@ -120,23 +164,52 @@ const formData = ref<FormDataType>({
   bz1: "",
   projectName: "",
   projecId: "",
+  payCompanyId: "",
+  payCompany: "",
+  agreedPayTime: null,
 });
 let columns = [];
+let columns1 = [];
 let showPicker = ref(false);
+let showPicker1 = ref(false);
+let showPicker2 = ref(false);
 const customFieldName = {
   text: "xmmc",
   value: "id",
 };
+const customFieldName1 = {
+  text: "name",
+  value: "id",
+};
 const onConfirm = (value) => {
   formData.value.projectId = value.selectedValues[0];
   formData.value.projectName = value.selectedOptions[0].xmmc;
   showPicker.value = false;
 };
+const onConfirm1 = (value) => {
+  formData.value.payCompanyId = value.selectedValues[0];
+  formData.value.payCompany = value.selectedOptions[0].name;
+  showPicker1.value = false;
+};
+const onConfirm2 = (value) => {
+  formData.value.agreedPayTime = value.selectedValues[0];
+  showPicker2.value = false;
+};
 const showPickerClick = (value) => {
-  if(read!='1'){
+  if (read != "1") {
     showPicker.value = true;
   }
 };
+const showPickerClick1 = (value) => {
+  if (read != "1") {
+    showPicker1.value = true;
+  }
+};
+const showPickerClick2 = (value) => {
+  if (read != "1") {
+    showPicker2.value = true;
+  }
+};
 const formRead = ref(false);
 const { activityInstanceId, participant, flowInstanceId, read } =
   route.query as {
@@ -183,10 +256,15 @@ const getProjectList = async () => {
   const result = await reqest.get(`/business/project/getListByUser`);
   columns = result.data;
 };
+const getCompanyList = async () => {
+  const result = await reqest.get(`/business/common/company-tree`);
+  columns1 = result.data;
+};
 /** 初始化 */
 onMounted(() => {
   initFormData();
   getProjectList();
+  getCompanyList();
   if (read === "1") {
     formRead.value = true;
   }

zjugis-business/src/main/java/com/zjugis/business/flow/loan/service/LoanFlowServiceImpl.java

@@ -162,6 +162,7 @@ public class LoanFlowServiceImpl implements LoanFlowService {
                 entity.setLoanNumber(flowInstance.getCode());
                 entity.setIsVerify(0);
                 entity.setPayCompanyId("4e99393c-c0ea-4146-a7fb-56fb8019c477");
+                entity.setPayCompany("浙江万维空间信息技术有限公司");
                 CommonResult<AdminUserRespDTO> result = adminUserApi.getUser(userId);
                 if (result.isSuccess()) {
                     entity.setWorker(result.getData().getNickname());

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -345,6 +345,16 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                         useMoneyRespVO.setProjectName(projectList.getXmmc());
                         useMoneyRespVO.setProjectDeptName(projectList.getZrbm());
                     }
+                }else{
+                    List<UseMoneyDetailDO> detailList=useMoneyDetailService.getListByUseMoeneyId(useMoneyRespVO.getId());
+                    String xmmc="";
+                    for(UseMoneyDetailDO detail:detailList){
+                        Project projectList = projectService.selectById(detail.getProjectId());
+                        if(projectList!=null){
+                            xmmc+="，"+projectList.getXmmc();
+                        }
+                    }
+                    useMoneyRespVO.setProjectName(xmmc.substring(1));
                 }
                 Integer flowStatus = useMoneyRespVO.getFlowStatus();
                 if (FLOW_FINISHED == flowStatus) {
@@ -828,6 +838,7 @@ public class UseMoneyServiceImpl implements UseMoneyService {
     private List<UseMoneyRespVO> getUseMoneyRespVOResult(List<UseMoneyDO> resultList) {
         CommonResult<List<DeptRespDTO>> deptList=deptApi.getDeptList();
         List<Project> projectList=projectService.getAllList(null);
+        List<UseMoneyDetailDO> detailList=useMoneyDetailService.getListByUseMoeneyId(null);
         List<UseMoneyRespVO> useMoneyRespVOPageResult = UseMoneyConvert.INSTANCE.convertList(resultList);
         useMoneyRespVOPageResult.forEach(useMoneyRespVO -> {
             Integer isAgent = useMoneyRespVO.getIsAgent();
@@ -845,6 +856,18 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                     }
                 }
 
+            }else{
+                String xmmc="";
+                for(UseMoneyDetailDO detail:detailList){
+                    if(useMoneyRespVO.getId().equals(detail.getUseMoneyId())){
+                        for(Project project:projectList){
+                            if(project.getId().equals(detail.getProjectId())){
+                                xmmc+="，"+project.getXmmc();
+                            }
+                        }
+                    }
+                }
+                useMoneyRespVO.setProjectName(xmmc.substring(1));
             }
             Integer flowStatus = useMoneyRespVO.getFlowStatus();
             if (FLOW_FINISHED == flowStatus) {