Merge branch 'master' of https://hel.hand-china.com/komatsu/komatsu-lease-app

src/modules/projectList/api/index.js

@@ -5,7 +5,7 @@ const baseURL = import.meta.env.DEV ? '/api' : import.meta.env.VITE_HTTP_BASE_UR
 const api = {
     // 首页查询
     getProjectList(data = {}) {
-        return post(`${baseURL}/app/api/app/financing/intention/query`, data)
+        return post(`${baseURL}/app/api/app/project/first/page`, data)
     },
     // 明细查询
     getProjectDetail(data ={}){

src/modules/projectList/store/index.js

-const state = {};
+import { ref, computed } from 'vue'
+import { defineStore } from 'pinia'
 
-export default {
-    namespaced: true,
-    state,
-};
+
+export const useProjectList = defineStore('formStore', () => {
+    const contractId = ref('')
+
+    return { contractId }
+})

src/modules/projectList/views/index.vue

@@ -8,7 +8,7 @@
       <PullRefresh v-model="refreshing" @refresh="getList" class="scroll">
         <List :finished="finished" finished-text="没有更多了" @load="loadApproval">
           <ListItem v-for="item in listValue" :other_title="item.other_title" :title="item.title" :values="item.values"
-                    @click="jump" />
+                    @click="jump(item.contractId)" />
         </List>
       </PullRefresh>
     </section>
@@ -25,7 +25,9 @@ import ListItem from '@/components/ListItem.vue'
 import Plus from '@/components/Plus.vue'
 import api from "../api";
 import { useRouter } from "vue-router";
+import { useProjectList } from "../store";
 
+const formStore = useProjectList()
 // const listValue = $ref([
 //   {
 //     title: '2204-DB001-001',
@@ -42,18 +44,20 @@ let listValue = $ref([]);
 
 const getList = async () => {
   // 下拉重置参数，重新加载
-  let list = await api.getProjectList({userId: window.localStorage.getItem('userId')});
-  if(list.result === 'SUCCESS'){
-    list  = list.data.map(item => ({
+  let res = await api.getProjectList({userId: window.localStorage.getItem('userId')});
+  console.log('hha', res);
+  let list = []
+  if(res.success){
+    list  = res.rows.map(item => ({
       ...item,
-      title: item.intentionNumber,
-      other_title: item.creationDate.split(' ')[0],
-      values: [["机型", "状态", "代理店"], [item.model, item.intentionStatusN, item.agentBpName]]
+      title: item.itemProjectNumber,
+      other_title: item.creationDate?.split(' ')[0],
+      values: [["机型", "状态", "代理店"], [item.model, item.intentionStatusN, item.agencyBpName]]
     }))
   }else {
     list = [];
   }
-  listValue = list.reverse();
+  listValue = list;
   refreshing = false;
 };
 getList();
@@ -64,8 +68,9 @@ const loadApproval = () => {
 }
 
 const router = useRouter();
-const jump = () => {
-  router.push({ name: 'projectList-views-projectForm' })
+const jump = (id) => {
+  formStore.contractId = id;
+  router.push({ name: 'projectList-views-projectForm'})
 }
 </script>
 

src/modules/projectList/views/plan.vue

@@ -51,8 +51,10 @@ import RepayPlan from '@/components/RepayPlan.vue'
 import { Icon } from 'vant'
 import {useRouter} from 'vue-router'
 import api from "../api";
+import { useProjectList } from "../store";
 
 const router = useRouter()
+const formStore = useProjectList()
 let currencyObj = $ref({
   // financingCurrency: '200,000.00',
   // headerCurrency: '5,000.00',
@@ -62,7 +64,8 @@ let currencyObj = $ref({
 let cashflow = []
 
 const getRepayPlanInfo = async () => {
-  const result = await api.getRepaymentDetails({"contractId": "777"})
+  // "contractId": "777"
+  const result = await api.getRepaymentDetails({"contractId": formStore.contractId})
   if(result.message === '请求成功'){
     const rows = result.rows[0];
     currencyObj = {

src/modules/projectList/views/projectForm.vue

@@ -23,9 +23,13 @@ import AuFormClass from "@/components/useAuForm";
 import GuarantorList from '../components/GuarantorList.vue'
 import { onActivated } from "vue";
 import api from "../api";
-import { useRouter } from "vue-router";
+import { useProjectList } from "../store";
+import { useRouter, useRoute } from "vue-router";
 
+const route = useRoute();
+const router = useRouter();
 
+const formStore = useProjectList()
 const formBaseConfigArr = [
   {
     title: '合同编号',
@@ -279,9 +283,8 @@ const formleaseInfoConfig = $ref(new AuFormClass(formleaseInfoArr))
 let contractId = $ref(null);
 
 const projectInfoDetail = async () => {
-  // 下拉重置参数，重新加载
-  let result = await api.getProjectDetail({"contractId": "777"});
-  console.log('list===', result);
+  console.log('url', formStore.contractId);
+  let result = await api.getProjectDetail({"contractId": formStore.contractId});
   if(result.success) {
     let rows = result.rows;
     let baseInfo = [];
@@ -331,37 +334,9 @@ const projectInfoDetail = async () => {
 
 projectInfoDetail();
 
-
-// const setup = (props,ctx) => {
-//   // const router = useRouter();
-//   //router是全局路由对象，route= userRoute()是当前路由对象
-//   let router = useRouter();
-//   let gotoRepayPlan = () => {
-//     console.log('hhaha')
-//     router.push({
-//       //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定
-//       // path:'/home',
-//       // query:{
-//       //   num:1
-//       // }
-//       name: 'repayPlan-views-plan',
-//       params: {
-//         contractId: '777'
-//       }
-//     });
-//   }
-//     return{
-//       gotoRepayPlan
-//     }
-// }
-const router = useRouter();
 const gotoRepayPlan = () =>{
-  console.log(contractId);
   router.push({
     name: 'projectList-views-plan',
-    query: {
-      contractId: contractId
-    }
   })
 }
 

src/modules/relatedProject/views/relatedFlow.vue

@@ -41,7 +41,7 @@ import { phoneReg } from '@/utils/Reg'
 import api from "../api";
 import { useRouter } from "vue-router";
 
-const step = $ref(1);
+let step = $ref(1);
 
 const firstFormConfig = $ref(new AuFormClass([
   {
@@ -253,4 +253,4 @@ const submit = async () => {
   content: '*';
   color: red;
 }
-</style>
\ No newline at end of file
+</style>

src/modules/selfService/api/index.js

@@ -7,6 +7,10 @@ const api = {
     getSelfServiceList(data={}) {
         return post(`${baseURL}/app/api/app/agency/auth/query`, data)
     },
+    //查询关联项目
+    getContracNumberList(data={}){
+        return post(`${baseURL}/app/api/app/bind/contract/query/all`, data)
+    },
     //查询所有区域
     getAreaList(data={}){
         return post(`${baseURL}/app/api/app/agency/area/query`, data)

src/modules/selfService/views/authorize.vue

@@ -6,6 +6,8 @@
 
     <section class="form">
       <CellGroup inset>
+        <Field required v-model="form.contractNumber" is-link readonly label="项目编号" @click="showProjectNumber = true"
+               input-align="right" />
         <Field v-model="form.code" readonly label="授权对象编码" input-align="right" />
         <Field required v-model="form.areaName" is-link readonly label="所属地区" @click="showArea = true"
           input-align="right" />
@@ -18,8 +20,12 @@
       <Button type="primary" block @click="confirm">确认</Button>
     </section>
 
+    <Popup v-model:show="showProjectNumber" position="bottom">
+      <Picker :columns="projectNumberColumns" :columns-field-names="{text:'contractNumber', value: 'contractId'}" @confirm="projectNumberConfirm" @cancel="showProjectNumber = false" >
+      </Picker>
+    </Popup>
     <Popup v-model:show="showArea" position="bottom">
-      <Picker :columns="areaColumns" :columns-field-names="{text:'value', value: 'code'}" @confirm="areaConfirm" @cancel="showArea = false" >
+      <Picker :columns="areaColumns" :columns-field-names="{text:'value', value: 'code'}" @confirm="areaConfirm" @change="areaChange" @cancel="showArea = false" >
       </Picker>
     </Popup>
     <Popup v-model:show="showPicker" position="bottom">
@@ -36,19 +42,27 @@
 <script setup>
 import { goBack } from "@/utils/globalFun"
 import Notice from "@/components/Notice.vue"
-import { NavBar, Field, CellGroup, Popup, Picker, Button , Icon, Search } from "vant";
+import {NavBar, Field, CellGroup, Popup, Picker, Button, Icon, Search, Toast} from "vant";
 import api from '../api'
+import { useRouter } from "vue-router";
+
 
+const router = useRouter();
 let showArea = $ref(false)
 
 const form = $ref({
   code: '',
+  contractNumber: '',
+  contractId: null,
   areaName: '',
   areaCode: '',
   agencyName: '',
   agencyCode: '',
   agencyId: '',
 })
+let areaChangeVal = $ref('')
+let showProjectNumber = $ref(false)
+let projectNumberColumns = $ref([])
 let showPicker = $ref(false);
 let areaColumns = $ref([]);
 let agencyColumns = $ref([]) ;
@@ -61,12 +75,19 @@ const agencyPagination = {
   page: 1,
   size: 1000,
 }
+const projectNumber = {
+  page: 1,
+  size: 1000
+}
+const projectNumberConfirm = (selectValues) => {
+  form.contractNumber = selectValues.contractNumber;
+  form.contractId = selectValues.contractId;
+  showProjectNumber = false;
+}
 
 const areaConfirm = ( selectedValues) => {
   form.areaName = selectedValues.value;
   form.areaCode = selectedValues.code;
-  // form.result = value;
-  // form
   showArea = false;
   getAgencyList();
 }
@@ -79,6 +100,13 @@ const agencyConfrim = (selectedValues) => {
   showPicker = false;
 }
 
+//监听所属区域是否改变
+const areaChange = (selectValues) => {
+  form.agencyName = '';
+  form.agencyCode = '';
+  form.agencyId = '';
+}
+
 //代理店模糊查询
 const searchAgency = () => {
   agencyColumns = [];
@@ -87,13 +115,23 @@ const searchAgency = () => {
 
 const confirm = async () => {
   const param = {
-    contractId: '',
+    contractId: form.contractId,
     agencyId: form.agencyId,
     receivets: new Date(),
   }
   const res = await api.confrimAgent(param);
-  console.log('hha', res);
+  if(res.success){
+    Toast.success('授权成功')
+    // router.push({ name: 'selfService-views-index' })
+  }else{
+    Toast.fail('授权失败')
+  }
+}
+const getContractList = async () => {
+  const res = await api.getContracNumberList({receivets: + new Date() + '', ...projectNumber})
+  projectNumberColumns = res.rows
 }
+getContractList()
 
 const getAreaList = async () => {
   const res = await api.getAreaList({receivets: +new Date() + '', ...areaPagination});

src/modules/selfService/views/index.vue

@@ -42,7 +42,7 @@ const queryList = async () => {
     if (res.total == 0) finished = true
     res.rows.forEach(item => {
       listValue.push({
-        title: item.authDate + '' || '',
+        title: item.authDate.split(' ')[0] + '' || '',
         values: [["授权对象编码", "授权对象名称", "所属区域"], [item.agencyCode, item.agencyName, item.areaName]],
         ...item
       })
@@ -66,7 +66,7 @@ const onRefresh = () => {
 };
 
 const loadApproval = () => {
-  pager.page++;
+  pagination.page++;
   queryList()
 }