H5调试工具集成

client/src/api/oa/kpgl/index.ts

@@ -1,8 +1,8 @@
 import request from '@/config/axios'
 
 // 获得开票分页查询
-export const getCommonCostPage = (params) => {
-  return request.get({ url: '/contractInvoice/page', params }, '/business')
+export const queryContractInvoicePage = (data) => {
+  return request.post({ url: '/contractInvoice/page', data }, '/business')
 }
 
 // 获得开票统计

client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -272,7 +272,7 @@ const list = ref([]) // 列表的数
 const getList = async () => {
   loading.value = true
   try {
-    const data = await kpglApi.getCommonCostPage(queryParams)
+    const data = await kpglApi.queryContractInvoicePage(queryParams)
     list.value = data.records
     total.value = data.total
   } finally {

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

@@ -4,7 +4,7 @@
       <div class="form">
         <span class="formSpan">发票号码：</span>
         <el-input
-          v-model="queryParams.commonCostNo"
+          v-model="queryParams.invoiceNumber"
           placeholder="请输入发票号码"
           style="width: 210px"
         />
@@ -13,14 +13,14 @@
       <div class="form">
         <span class="formSpan">合同名称：</span>
         <el-input
-          v-model="queryParams.projectDeptId"
+          v-model="queryParams.contractName"
           placeholder="请输入合同名称"
           style="width: 160px"
         />
       </div>
       <div class="form">
         <span class="formSpan">区域经理：</span>
-        <UserOrgTree v-model="queryParams['userId']" />
+        <UserOrgTree v-model="queryParams['managerId']" />
       </div>
       <div class="form">
         <span class="formSpan">责任部门：</span>
@@ -28,17 +28,8 @@
       </div>
       <div class="form">
         <span class="formSpan">项目名称：</span>
-        <el-input v-model="queryParams.status" style="width: 160px" />
+        <el-input v-model="queryParams.xmmc" style="width: 160px" />
       </div>
-      <div class="form">
-        <span class="formSpan">付款单位：</span>
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入报销总金额"
-          style="width: 160px"
-        />
-      </div>
-
       <div class="form">
         <span class="formSpan">开票状态：</span>
         <el-input v-model="queryParams.status" style="width: 160px" />
@@ -47,7 +38,7 @@
       <div class="form" style="width: 380px">
         <span class="formSpan">开票日期：</span>
         <el-date-picker
-          v-model="queryParams.applyTime"
+          v-model="invoiceTime"
           type="daterange"
           unlink-panels
           range-separator="到"
@@ -58,7 +49,7 @@
       <div class="form" style="width: 380px">
         <span class="formSpan">回款日期：</span>
         <el-date-picker
-          v-model="queryParams.applyTime"
+          v-model="returnTime"
           type="daterange"
           unlink-panels
           range-separator="到"
@@ -69,7 +60,11 @@
 
       <div class="form">
         <span class="formSpan">是否回款：</span>
-        <el-input v-model="queryParams.status" style="width: 160px" />
+        <el-select v-model="queryParams.isReturn" placeholder="请选择">
+          <el-option label="全部" value="" />
+          <el-option label="是" value="1" />
+          <el-option label="否" value="0" />
+        </el-select>
       </div>
       <div class="from">
         <div class="btnBox">
@@ -175,7 +170,7 @@
 import * as kpglApi from '@/api/oa/kpgl'
 import { getFlowUrl } from '@/api/oa/index'
 import { openFlow } from '@/utils/flow'
-import { dateFormatter2 } from '@/utils/formatTime'
+import { formatDate, dateFormatter2 } from '@/utils/formatTime'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
@@ -189,17 +184,23 @@ const xmztMap: any = {
   4: '部分回款',
   20: '开票申请完成'
 }
+
+const invoiceTime = ref([])
+const returnTime = ref([])
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  commonCostNo: undefined,
-  userId: undefined,
-  deptId: undefined,
-  applyTime: [],
-  projectDeptId: undefined,
-  costType: undefined,
-  status: undefined,
-  totalAmount: undefined
+  invoiceNumber: '',
+  contractName: '',
+  deptId: '',
+  managerId: '',
+  xmmc: '',
+  flowStatus: '',
+  invoiceOn: '',
+  invoiceOff: '',
+  returnOn: '',
+  returnOff: '',
+  isReturn: ''
 })
 const infoList: any = ref([
   {
@@ -222,8 +223,16 @@ const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  if (invoiceTime.value.length > 0) {
+    queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
+    queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  }
+  if (returnTime.value.length > 0) {
+    queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
+    queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  }
   try {
-    const data = await kpglApi.getCommonCostPage(queryParams)
+    const data = await kpglApi.queryContractInvoicePage(queryParams)
     list.value = data.records
     total.value = data.total
   } finally {
@@ -233,6 +242,14 @@ const getList = async () => {
 //统计信息
 const getStatics = async () => {
   loading.value = true
+  if (invoiceTime.value.length > 0) {
+    queryParams.invoiceOn = formatDate(invoiceTime.value[0], 'YYYY-MM-DD')
+    queryParams.invoiceOff = formatDate(invoiceTime.value[1], 'YYYY-MM-DD')
+  }
+  if (returnTime.value.length > 0) {
+    queryParams.returnOn = formatDate(returnTime.value[0], 'YYYY-MM-DD')
+    queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
+  }
   const data = await kpglApi.getStatics(queryParams)
   infoList.value[0].num = data.ykp
   infoList.value[1].num = data.yhk

client/src/views/OaSystem/financialManagement/kpglPage/myIndex.vue

@@ -255,7 +255,7 @@ const list = ref([]) // 列表的数
 const getList = async () => {
   loading.value = true
   try {
-    const data = await kpglApi.getCommonCostPage(queryParams)
+    const data = await kpglApi.queryContractInvoicePage(queryParams)
     list.value = data.records
     total.value = data.total
   } finally {

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

@@ -345,7 +345,7 @@ const handleStartContractSign = () => startContractSignMutate(projectId as Proje
 const { mutate: startSubcontractMutate } = useMutation(startSubcontractApply, {
   onSuccess: (data) => openFlow(router, data, '分包申请')
 })
-const handleStartSubcontract = () => startSubcontractMutate(projectId as ProjectId)
+const handleStartSubcontract = () => startSubcontractMutate(projectDetail['projectId'] as ProjectId)
 
 /**
  * 发起外包合同申请
@@ -353,7 +353,7 @@ const handleStartSubcontract = () => startSubcontractMutate(projectId as Project
 const { mutate: startOutsourcingMutate } = useMutation(startOutsourcingApply, {
   onSuccess: (data) => openFlow(router, data, '外包申请')
 })
-const handleStartOutsourcing = () => startOutsourcingMutate(projectId as ProjectId)
+const handleStartOutsourcing = () => startOutsourcingMutate(projectDetail['projectId'] as ProjectId)
 </script>
 <style lang="scss" scoped>
 @import './projectDetail.scss';

client_h5/index.html

@@ -4,6 +4,10 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0, maximum-scale=1">
+    <script src='https://cdn.bootcss.com/vConsole/3.3.2/vconsole.min.js'></script>
+    <script type="text/javascript">
+      window.vConsole = new window.VConsole()
+    </script>
     <title></title>
   </head>
   <body>