版本更新

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="pageLoading" loading-text="审批中...">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
         <el-button
@@ -819,6 +819,7 @@ const visible = ref(false);
 const row = ref({});
 const rowIndex = ref(-1);
 const totalAmount = ref(0);
+const pageLoading = ref(false)
 
 const form = reactive({
   purchaseinventoryList: [],
@@ -1070,7 +1071,9 @@ function handleClickOutside(event) {
 }
 
 function handelApply() {
+  pageLoading.value = true;
   productTransferApproved(route.query.supplyBusNo).then((res) => {
+    pageLoading.value = false
     if (res.code == 200) {
       proxy.$modal.msgSuccess("操作成功");
       store.clearCurrentDataPLDB();
@@ -1078,6 +1081,8 @@ function handelApply() {
       // 跳转到审核页面
       router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'batchTransfer'}});
     }
+  }).catch(() => {
+    pageLoading.value = false
   })
 }
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="pageLoading" loading-text="审批中...">
     <el-row :gutter="10" class="mb8" v-if="viewStatus">
       <el-col :span="1.5">
         <el-button
@@ -817,6 +817,7 @@ const tableRef = ref(undefined); // 表格引用
 const currentRow = ref(undefined); // 当前操作的行
 const medicineSearchKey = ref("");
 const itemType = ref("");
+const pageLoading = ref(false)
 const forms = reactive({
   purchaseinventoryList: [],
 })
@@ -1211,8 +1212,10 @@ function handleClickOutside(event) {
 }
 
 function handelApply() {
+  pageLoading.value = true
   productTransferApproved(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
+      pageLoading.value = false
       proxy.$modal.msgSuccess("操作成功");
       tagsViewStore.delView(router.currentRoute.value);
       store.clearCurrentDataDB();
@@ -1222,7 +1225,9 @@ function handelApply() {
       //   toLastView(visitedViews, route) 
       // })
     }
-  })
+  }).catch(() => { 
+    pageLoading.value = false
+  });
 }
 
 // 驳回
@@ -1314,6 +1319,8 @@ function handleLocationClick(id,purposeLocationId,itemId, index) {
       form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || ""
       form.purchaseinventoryList[index].totalPurposeQuantity = res.data[0].objQuantity || 0;
       form.purchaseinventoryList[index].totalSourceQuantity = res.data[0].orgQuantity || 0;
+      // 临时存一下价格 处理切换单位时候丢精度的问题
+      form.purchaseinventoryList[index].tempPrice = res.data[0].price;
     
       form.purchaseinventoryList[index].traceNo = res.data[0].traceNo || "";
       form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || "";
@@ -1505,8 +1512,7 @@ function getMaxCounts(row,index,counts){
       (decimalPart*row.partPercent).toFixed(0) + form.purchaseinventoryList[index].minUnitCode_dictText
     }
   }else{
-    form.purchaseinventoryList[index].price =
-    form.purchaseinventoryList[index].price * row.partPercent;
+    form.purchaseinventoryList[index].price = row.tempPrice
     form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(2);
   } 
 }