字段修改

client/src/service/contract.ts

@@ -116,19 +116,6 @@ export const getContractPaymentList = async (contractId: ContractId) => {
   )
 }
 
-/**
- * 合同付款汇总
- * @param contractId
- */
-export const getContractPaymentCalc = async (contractId: ContractId) => {
-  return await request.get(
-    {
-      url: '/contract-payment/calc',
-      params: { contractId }
-    },
-    '/business'
-  )
-}
 /**
  * 合同查分包金额承担信息
  * @param contractId

client/src/views/OaSystem/oaLayout/index.vue

@@ -89,15 +89,15 @@ watch(
         currentIframeId.value = route.query.iFrameId as string
       }
       if (route.name === 'MainOfficeCenter') {
-        // subscribe.emit('iframe:reload', route)
+        subscribe.emit('iframe:reload', route)
       }
       clearTimeout(timeout)
-    }, 0)
+    }, 200)
   },
   {
     immediate: true
   }
-)[(1, 2)][(1, 2, 3)]
+)
 </script>
 <style>
 @import url('./content.scss');

client/src/views/OaSystem/oaLayout/menus.vue

@@ -153,8 +153,7 @@ const toMainOfficeCenter = () => {
     path: '/mainOfficeCenter',
     query: {
       iframe: '1',
-      // url: `${baseUrl}/workflow/HandlerCaseCenter/index`,
-      url: 'http://localhost:6090/HandlerCaseCenter/index',
+      url: `${baseUrl}/workflow/HandlerCaseCenter/index`,
       iFrameId: 'mainOfficeCenter_001'
     }
   })

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -443,7 +443,7 @@
             <tr>
               <td class="th">分包金额（元）：</td>
               <td>
-                <el-input v-model="cContractDetail.contractAmount" :disabled="!editor" />
+                <el-input v-model="cContractDetail.applyContractAmount" :disabled="!editor" />
               </td>
               <td class="th">供应商：</td>
               <td>
@@ -549,7 +549,7 @@
             <tr>
               <td class="th">外包金额（元）：</td>
               <td>
-                <el-input v-model="cContractDetail.contractAmount" :disabled="!editor" />
+                <el-input v-model="cContractDetail.applyContractAmount" :disabled="!editor" />
               </td>
               <td class="th">供应商：</td>
               <td>
@@ -653,9 +653,11 @@
           <table>
             <tr>
               <td class="th">已付款金额（元）：</td>
-              <td>{{ calcInfo?.pay ?? 0 }}</td>
+              <td>{{ cContractDetail?.applyPayAmount ?? 0 }}</td>
               <td class="th">合同余额（元）：</td>
-              <td>{{ cContractDetail.contractAmount - (calcInfo?.pay || 0) }}</td>
+              <td>{{
+                (cContractDetail.applyContractAmount ?? 0) - (cContractDetail?.applyPayAmount ?? 0)
+              }}</td>
             </tr>
           </table>
         </div>
@@ -681,7 +683,6 @@ import {
   startContractInvoice,
   queryCustomerTree,
   queryCompanyTree,
-  getContractPaymentCalc,
   productSoftpatent
 } from '@/service/contract'
 import { getSupplierTree } from '@/service/system'
@@ -762,17 +763,6 @@ const { refetch } = useQuery(
     }
   }
 )
-//查询分包付款数据
-const calcInfo = ref<{
-  balance: number
-  pay: number
-}>()
-const { mutate: queryContractPaymentCalcMutate } = useMutation(getContractPaymentCalc, {
-  onSuccess: (data) => {
-    calcInfo.value = data
-  }
-})
-
 /***
  * 查询委托方数据
  * **/
@@ -796,7 +786,6 @@ const switchContractInfo = (key: number, type: string): void => {
     mContractDetail.value = mContractDetails.value[key]
   } else {
     cContractDetail.value = mContractDetail.value?.contractSubList[key]
-    queryContractPaymentCalcMutate(cContractDetail.value.id)
   }
   contractMainType.value = type
   contractInfoIndex.value = key

client/src/views/OaSystem/projectCenter/purchaseContract/purchaseContract.vue

@@ -76,21 +76,22 @@
         </el-select>
       </div>
       <div class="form form-time-range">
-        <span class="formSpan">合同拿出时间：</span>
+        <span class="formSpan">拿出时间：</span>
         <el-date-picker
           v-model="queryParams.contractOn"
           type="date"
-          value-format="YYYY-MM-DD"
           placeholder="请选择合同拿出时间"
         />
       </div>
       <div class="form form-time-range">
-        <span class="formSpan">合同拿回时间：</span>
+        <span class="formSpan">拿出/拿回时间：</span>
         <el-date-picker
-          v-model="queryParams.contractOff"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择合同拿回时间"
+          v-model="lxsjObj"
+          type="daterange"
+          unlink-panels
+          range-separator="To"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
         />
       </div>
       <div class="form form-time-range">
@@ -252,6 +253,7 @@ const queryParams = reactive<{
   managerId: '',
   deptId: ''
 })
+const lxsjObj = ref()
 const dueTimeObj = ref()
 
 const handleCurrentChange = (pageNo: number) => {
@@ -259,6 +261,13 @@ const handleCurrentChange = (pageNo: number) => {
   queryContractListAjax()
 }
 const exportHandle = async () => {
+  if (lxsjObj.value && lxsjObj.value.length > 0) {
+    queryParams.contractOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
+    queryParams.contractOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
+  } else {
+    queryParams.contractOn = ''
+    queryParams.contractOff = ''
+  }
   if (dueTimeObj.value && dueTimeObj.value.length > 0) {
     queryParams.dueTimeStart = moment(dueTimeObj.value[0]).format('YYYY-MM-DD')
     queryParams.dueTimeEnd = moment(dueTimeObj.value[1]).format('YYYY-MM-DD')
@@ -276,6 +285,13 @@ const searchHandle: () => void = () => {
 }
 const queryContractListAjax = async (): Promise<void> => {
   const urlApi = `/contract/page`
+  if (lxsjObj.value && lxsjObj.value.length > 0) {
+    queryParams.contractOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
+    queryParams.contractOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
+  } else {
+    queryParams.contractOn = ''
+    queryParams.contractOff = ''
+  }
   if (dueTimeObj.value && dueTimeObj.value.length > 0) {
     queryParams.dueTimeStart = moment(dueTimeObj.value[0]).format('YYYY-MM-DD')
     queryParams.dueTimeEnd = moment(dueTimeObj.value[1]).format('YYYY-MM-DD')
@@ -305,6 +321,13 @@ const contractListCalc = ref({
 })
 const queryContractListCalc = async (): Promise<void> => {
   const urlApi = `/contract/list/calc`
+  if (lxsjObj.value && lxsjObj.value.length > 0) {
+    queryParams.contractOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
+    queryParams.contractOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
+  } else {
+    queryParams.contractOn = ''
+    queryParams.contractOff = ''
+  }
   if (dueTimeObj.value && dueTimeObj.value.length > 0) {
     queryParams.dueTimeStart = moment(dueTimeObj.value[0]).format('YYYY-MM-DD')
     queryParams.dueTimeEnd = moment(dueTimeObj.value[1]).format('YYYY-MM-DD')

client_h5/src/App.vue

@@ -10,27 +10,13 @@ const initUserInfoHandler = async () => {
   const code: string = (await getDDAuthCode()) as string;
   const userIdResult = await getUserIdByDD({ code });
   if (userIdResult && userIdResult?.data) {
-<<<<<<< HEAD
-        localStorage.setItem("ACCESS_TOKEN", userIdResult?.data.accessToken)
-        useDictStoreWithOut()
-        const userResult = await getUserInfoById()
-        if (userResult && userResult?.data) { 
-            const userInfo: UserInterface = {
-                id: userResult?.data.user.id,
-                avatar: userResult?.data.user.avatar,
-                nickname: userResult?.data.user.nickname,
-                signatureUrl: userResult?.data.user.signatureUrl
-            }
-            userStore.setUser(userInfo)
-            localStorage.setItem("_userInfo", JSON.stringify(userInfo))
-        }
-=======
     localStorage.setItem("ACCESS_TOKEN", userIdResult?.data.accessToken);
     useDictStoreWithOut();
     const userResult = await getUserInfoById();
     if (userResult && userResult?.data) {
       const userInfo: UserInterface = {
         id: userResult?.data.user.id,
+        avatar:  userResult?.data.user.avatar,
         nickname: userResult?.data.user.nickname,
         deptId: userResult?.data.user.deptId,
         deptName: userResult?.data.user.deptName,
@@ -38,7 +24,6 @@ const initUserInfoHandler = async () => {
       };
       userStore.setUser(userInfo);
       localStorage.setItem("_userInfo", JSON.stringify(userInfo));
->>>>>>> 68b13836e9aff463da4eb9e8ecf33e2d17476cc6
     }
   }
 };

client_h5/src/components/card.vue

@@ -26,7 +26,6 @@ const props = defineProps<{
 
 <style scoped lang="scss">
 .card_box {
-  height: 100%;
   display: flex;
   flex-direction: column;
   padding: 15px;

client_h5/src/stores/modules/user.ts

@@ -6,7 +6,7 @@ export interface UserInterface {
   nickname: string; //用户昵称
   deptId: string; // 用户部门id
   deptName: string; // 用户部门id
-  signatureUrl: string; //用户前面
+  signatureUrl: string; //用户签名
 }
 const UserStore = defineStore("UserStore", {
   state: () => ({