修改普通报销核减,增加普通报销流程查看,修改dev环境流程查看页面url前缀

client/.env.dev

@@ -11,7 +11,7 @@ VITE_BASE_URL='http://10.10.10.7:48080'
 VITE_UPLOAD_URL='/infra/file/upload'
 
 # 流程详情页面路径
-VITE_PROCESS_DETAIL_URI = 'http://localhost:6090'
+VITE_PROCESS_DETAIL_URI = 'http://10.10.10.7:48080/workflow'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api

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

@@ -113,6 +113,7 @@ defineOptions({ name: 'CommonCostDept' })
 const { wsCache } = useCache()
 const user = wsCache.get(CACHE_KEY.USER)
 const userDeptId = user.user.deptId ? user.user.deptId : ''
+const router = useRouter()
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -168,6 +169,18 @@ const handleQuery = () => {
   getOverview()
 }
 
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
 /** 分页操作 */
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

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

@@ -150,6 +150,7 @@ import { dateFormatter2 } from '@/utils/formatTime'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 
 defineOptions({ name: 'CommonCost' })
+const router = useRouter()
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -207,6 +208,18 @@ const handleQuery = () => {
   getOverview()
 }
 
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
 /** 分页操作 */
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

client/src/views/OaSystem/mineCenter/rightChild/ptbx.vue

@@ -99,6 +99,7 @@ defineOptions({ name: 'CommonCostDept' })
 const { wsCache } = useCache()
 const user = wsCache.get(CACHE_KEY.USER)
 const userId = user.user.id ? user.user.id : ''
+const router = useRouter()
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -154,6 +155,18 @@ const handleQuery = () => {
   getOverview()
 }
 
+const operateClick = (row: any) => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url:
+        `${
+          import.meta.env.VITE_PROCESS_DETAIL_URI
+        }/IFlowInstance/redirectFlowPage?flowInstanceId=` + row.instanceId
+    }
+  })
+}
+
 /** 分页操作 */
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo
@@ -168,5 +181,5 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-@import url(./book.scss);
+@import url('./book.scss');
 </style>

zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -5,7 +5,7 @@
     let read = z.ui.comm.getUrlParam("read");
     let finance = z.ui.comm.getUrlParam("finance");
     let detailProjectIndex = 0;
-    let previousAmount = z.ui.input("[name='createReqVO$totalAmount']").getValue;
+    let previousAmount = z.ui.input("[name='createReqVO$totalAmount']").getValue();
     let costTypeJSON = JSON.parse(document.querySelector('#costTypeJSON').value)
     window.onload = function (ex) {
         let timeObject = document.querySelector('#detailList')
@@ -348,6 +348,11 @@
                 detailList.push(z.ui.form.childStringify(mealName));
             }
         }
+        if(Number(postData.createReqVO.amount) > Number(previousAmount)){
+            z.ui.alertWarning(`核减后金额不能大于原来金额!`)
+            all({success: false});
+            return;
+        }
         //发生金额变化
         if(Number(postData.createReqVO.amount) != Number(previousAmount)){
             let num = Number(previousAmount) - Number(postData.createReqVO.amount);

zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -5,7 +5,7 @@
     let read = z.ui.comm.getUrlParam("read");
     let finance = z.ui.comm.getUrlParam("finance");
     let detailProjectIndex = 0;
-    let previousAmount = z.ui.input("[name='createReqVO$totalAmount']").getValue;
+    let previousAmount = z.ui.input("[name='createReqVO$totalAmount']").getValue();
     let costTypeJSON = JSON.parse(document.querySelector('#costTypeJSON').value)
     window.onload = function (ex) {
         let timeObject = document.querySelector('#detailList')
@@ -348,6 +348,11 @@
                 detailList.push(z.ui.form.childStringify(mealName));
             }
         }
+        if(Number(postData.createReqVO.amount) > Number(previousAmount)){
+            z.ui.alertWarning(`核减后金额不能大于原来金额!`)
+            all({success: false});
+            return;
+        }
         //发生金额变化
         if(Number(postData.createReqVO.amount) != Number(previousAmount)){
           let num = Number(previousAmount) - Number(postData.createReqVO.amount);