提交merge1.3

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

@@ -166,20 +166,12 @@ import {
   reject,
   init,
   getpurchaseInventoryDetail,
-<<<<<<< HEAD
-  getpurchaseInventoryDetailReturn
-} from "./components/api";
-import { purchaseInventoryApproved as purchaseReturnApproved } from '../returnedPurchase/components/api';
-import { useStore } from '@/store/store';
-import { formatDate } from '@/utils/index';
-=======
   getpurchaseInventoryDetailReturn,
 } from './components/api';
 import { useStore } from '@/store/store';
 import { formatDate } from '@/utils/index';
 import ChkstockDetailsDialog from '@/views/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue';
 import TransferDetailsDialog from '@/views/medicationmanagement/transferManagent/components/transferDetailsDialog.vue';
->>>>>>> v1.3
 import useTagsViewStore from '@/store/modules/tagsView';
 const router = useRouter();
 const route = useRoute();
@@ -257,28 +249,8 @@ function handelApply(row) {
         proxy.$modal.msgSuccess('操作成功');
         getList();
       }
-<<<<<<< HEAD
-    })
-  }else if(row.typeEnum == 5){ // 采购退货审批通过
-    console.log("采购退货审批通过，typeEnum:", row.typeEnum);
-    console.log("供应单据号:", row.supplyBusNo);
-    purchaseReturnApproved(row.supplyBusNo).then((res) => {
-      console.log("采购退货审批结果:", res);
-      if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
-        getList();
-      } else {
-        proxy.$modal.msgError("操作失败: " + (res.msg || "未知错误"));
-      }
-    }).catch((error) => {
-      console.error("采购退货审批错误:", error);
-      proxy.$modal.msgError("操作异常: " + error.message);
-    });
-  }else{
-=======
     });
   } else {
->>>>>>> v1.3
     purchaseInventoryApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
         proxy.$modal.msgSuccess('操作成功');
@@ -290,30 +262,17 @@ function handelApply(row) {
 
 // 审批,查看
 function handelApplys(row, view) {
-<<<<<<< HEAD
-  if (row.typeEnum == 2) {
-=======
   if (row.typeEnum == 100086) {
->>>>>>> v1.3
     //商品调拨
     // 跳转到审核页面
     router.replace({
       path: '/medicationmanagement/transferManagement/transferManagent',
       query: { supplyBusNo: row.supplyBusNo, view: view },
     });
-<<<<<<< HEAD
-  } else if (row.typeEnum == 8) {
-    //8 批量
-    router.replace({
-      path: '/medicationmanagement/transferManagement/batchTransfer',
-      query: { supplyBusNo: row.supplyBusNo, view: view },
-    });
-=======
   } else if (row.typeEnum == 8 || row.typeEnum == 2) {
     //8 批量
     isApply.value = true;
     proxy.$refs['tranDetailsDialogRef'].open(row.supplyBusNo);
->>>>>>> v1.3
   } else if (row.typeEnum == 7) {
     //领用出库审批通过
     router.replace({
@@ -327,17 +286,9 @@ function handelApplys(row, view) {
       query: { supplyBusNo: row.supplyBusNo, view: view },
     });
   } else if (row.typeEnum == 4) {
-<<<<<<< HEAD
-    //盘点审批
-    router.replace({
-      path: '/medicationmanagement/chkstock/chkstockPart',
-      query: { supplyBusNo: row.supplyBusNo, view: view },
-    });
-=======
     isApply.value = true;
     //盘点审批
     proxy.$refs['detailsDialogRef'].open(row.supplyBusNo);
->>>>>>> v1.3
   } else if (row.typeEnum == 10) {
     // 批量盘点
     router.replace({