Merge remote-tracking branch 'origin/develop' into develop

- 修正 chkstockBatch 页面审核路由路径
- 修正 lossReporting 页面审核路由路径
- 修正 purchaseDocument 页面审核路由路径
- 修正 requisitionManagement 页面审核路由路径
- 修正 returningInventory 页面审核路由路径
- 修正 returnedPurchase 页面审核路由路径
- 修正 batchTransfer 页面审核路由路径
- 修正 transferManagent 页面审核路由路径
- 在采购单据拒绝流程中添加关闭当前页签功能
- 在采购单据通过流程中添加关闭当前页签功能

openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue

@@ -2069,7 +2069,7 @@ function handleReject() {
       store.clearCurrentDataPLPDALL();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'chkstockBatch' },
       });
     }
@@ -2086,7 +2086,7 @@ function handelApply() {
         store.clearCurrentDataPLPDALL();
         // 跳转到审核页面
         router.replace({
-          path: '/aaaa/billapproval',
+          path: '/financialManagement/medicationmanagement/billapproval',
           query: { type: 'chkstockBatch' },
         });
       }

openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue

@@ -1024,7 +1024,7 @@ function handleReject() {
       store.clearCurrentDataBS();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'lossReporting' },
       });
     }
@@ -1040,7 +1040,7 @@ function handelApply() {
       store.clearCurrentDataBS();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'lossReporting' },
       });
     }

openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue

@@ -1834,11 +1834,12 @@ function handleReject() {
   reject(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess("操作成功");
+      // 关闭当前页签
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentData();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'purchaseDocument' },
       });
     }
@@ -1851,11 +1852,12 @@ function handelApply() {
       if (res.code == 200) {
         pageLoading.value = false;
         proxy.$modal.msgSuccess("操作成功");
+        // 关闭当前页签
         tagsViewStore.delView(router.currentRoute.value);
         store.clearCurrentData();
         // 跳转到审核页面
         router.replace({
-          path: '/aaaa/billapproval',
+          path: '/financialManagement/medicationmanagement/billapproval',
           query: { type: 'purchaseDocument' },
         });
       }

openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue

@@ -909,7 +909,7 @@ function handleReject() {
       store.clearCurrentDataLYCK();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'requisitionManagement' },
       });
     }
@@ -925,7 +925,7 @@ function handelApply() {
       store.clearCurrentDataLYCK();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'requisitionManagement' },
       });
     }

openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/returningInventory/index.vue

@@ -982,7 +982,7 @@ function handleReject() {
       store.clearCurrentDataLYTK();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'returningInventory' },
       });
     }
@@ -998,7 +998,7 @@ function handelApply() {
       store.clearCurrentDataLYTK();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'returningInventory' },
       });
     }

openhis-ui-vue3/src/views/medicationmanagement/returnedPurchase/index.vue

@@ -1368,7 +1368,7 @@ function handleReject() {
       store.clearCurrentReturnData();
       // 跳转到审核页面
       router.replace({
-        path: '/finance/medicationmanagement/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'returnedPurchase' },
       });
     }
@@ -1385,7 +1385,7 @@ function handelApply() {
         store.clearCurrentReturnData();
         // 跳转到审核页面
         router.replace({
-          path: '/finance/medicationmanagement/billapproval',
+          path: '/financialManagement/medicationmanagement/billapproval',
           query: { type: 'returnedPurchase' },
         });
       }

openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue

@@ -708,7 +708,7 @@ function handelApply() {
         store.clearCurrentDataPLDBAll();
         // 跳转到审核页面
         router.replace({
-          path: '/aaaa/billapproval',
+          path: '/financialManagement/medicationmanagement/billapproval',
           query: { type: 'batchTransfer' },
         });
       }
@@ -727,7 +727,7 @@ function handleReject() {
       store.clearCurrentDataPLDBAll();
       // 跳转到审核页面
       router.replace({
-        path: '/aaaa/billapproval',
+        path: '/financialManagement/medicationmanagement/billapproval',
         query: { type: 'batchTransfer' },
       });
     }

openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue

@@ -988,7 +988,7 @@ function handelApply() {
         tagsViewStore.delView(router.currentRoute.value);
         store.clearCurrentDataDB();
         // 跳转到审核页面
-        router.replace({ path: '/aaaa/billapproval', query: { type: 'transferManagent' } });
+        router.replace({ path: '/financialManagement/medicationmanagement/billapproval', query: { type: 'transferManagent' } });
         // proxy.$tab.closePage(route).then(({ visitedViews }) => {  // 关闭当前页
         //   toLastView(visitedViews, route)
         // })
@@ -1007,7 +1007,7 @@ function handleReject() {
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataDB();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/billapproval', query: { type: 'transferManagent' } });
+      router.replace({ path: '/financialManagement/medicationmanagement/billapproval', query: { type: 'transferManagent' } });
     }
   });
 }