提交merge1.3

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

@@ -41,6 +41,15 @@
         @change="handleDateQuery"
         value-format="YYYY-MM-DD"
       />
+      <el-button
+        class="table-header-button"
+        type="primary"
+        plain
+        icon="Download"
+        @click="handleExport"
+      >
+        导出
+      </el-button>
       <el-button
         class="table-header-button"
         icon="Refresh"
@@ -140,6 +149,8 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
+    <ChkstockDetailsDialog ref="detailsDialogRef" :isApply="isApply" />
+    <TransferDetailsDialog ref="tranDetailsDialogRef" :isApply="isApply" />
   </div>
 </template>
         
@@ -155,11 +166,20 @@ 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();
@@ -167,6 +187,7 @@ const store = useStore();
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(['selectAdviceBase']);
 const total = ref(0);
+const isApply = ref(false);
 const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
@@ -236,6 +257,7 @@ function handelApply(row) {
         proxy.$modal.msgSuccess('操作成功');
         getList();
       }
+<<<<<<< HEAD
     })
   }else if(row.typeEnum == 5){ // 采购退货审批通过
     console.log("采购退货审批通过，typeEnum:", row.typeEnum);
@@ -253,6 +275,10 @@ function handelApply(row) {
       proxy.$modal.msgError("操作异常: " + error.message);
     });
   }else{
+=======
+    });
+  } else {
+>>>>>>> v1.3
     purchaseInventoryApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
         proxy.$modal.msgSuccess('操作成功');
@@ -264,19 +290,30 @@ 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({
@@ -290,11 +327,17 @@ 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({
@@ -336,7 +379,15 @@ function handleDateQuery(value) {
     queryParams.value.applyTimeETime = undefined;
   }
 }
-
+function handleExport() {
+  proxy.downloadGet(
+    'inventory-manage/receipt/export-excel',
+    {
+      ...queryParams.value,
+    },
+    `库存审批单_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
+  );
+}
 optionInit();
 function optionInit() {
   init().then((res) => {