提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue
@@ -0,0 +1,267 @@
+<template>
+  <div>
+    <el-dialog
+      v-model="dialogVisible"
+      title="盘点单明细"
+      width="90%"
+      :destroy-on-close="true"
+      v-loading="loading"
+      @close="close"
+    >
+      <el-row style="margin-bottom: 20px">
+        <template v-if="props.isApply">
+          <el-button plain type="primary" icon="Edit" @click="handelApply"> 审批通过 </el-button>
+          <el-button type="primary" plain icon="Edit" @click="handleReject"> 驳回 </el-button>
+        </template>
+        <el-button type="warning" plain icon="Printer" @click="handlePrint"> 打印单据 </el-button>
+        <el-button type="primary" plain icon="Download" @click="handleExport"> 导出 </el-button>
+      </el-row>
+      <el-descriptions :column="4" style="margin-bottom: 10px">
+        <el-descriptions-item label="单据号:">
+          {{ detailsList[0]?.busNo || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="盘点仓库:">
+          {{ detailsList[0]?.purposeLocationName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目类型:">
+          {{ detailsList[0]?.itemType_dictText || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="盘点日期:">
+          {{ proxy.formatDateStr(detailsList[0]?.occurrenceTime, 'YYYY-MM-DD HH:mm:ss') || '-' }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-table :data="detailsList" border max-height="600">
+        <el-table-column label="序号" width="60" type="index" align="center" />
+        <el-table-column label="项目名称" align="center" prop="itemName" />
+        <el-table-column
+          label="规格"
+          align="center"
+          prop="totalVolume"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="厂家/产地"
+          align="center"
+          prop="manufacturerText"
+          width="180"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column label="产品批号" align="center" prop="lotNumber" />
+        <el-table-column label="单价" align="right" header-align="center" prop="price" width="120">
+          <template #default="scope">
+            {{ scope.row.price.toFixed(2) + ' 元' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="盘点单位"
+          align="center"
+          prop="measurementUnitCode_dictText"
+          width="80"
+        />
+        <el-table-column
+          label="盘前库存"
+          align="right"
+          header-align="center"
+          prop="itemName"
+          width="100"
+        >
+          <template #default="scope">
+            {{
+              formatQuantity(
+                Number(scope.row.totalQuantity) - Number(scope.row.itemQuantity),
+                scope.row
+              )
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="实盘数量"
+          align="right"
+          header-align="center"
+          prop="totalQuantity"
+          width="100"
+        >
+          <template #default="scope">
+            {{ formatQuantity(scope.row.totalQuantity, scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="实盘金额"
+          align="right"
+          header-align="center"
+          prop="totalPrice"
+          width="120"
+        >
+          <template #default="scope">
+            {{ scope.row.totalPrice.toFixed(2) + ' 元' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="盈亏数量"
+          align="right"
+          header-align="center"
+          prop="itemQuantity"
+          width="100"
+        >
+          <template #default="scope">
+            {{ formatQuantity(scope.row.itemQuantity, scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="盈亏金额" align="right" header-align="center" prop="">
+          <template #default="scope">
+            {{
+              ((scope.row.itemQuantity * scope.row.price) / scope.row.partPercent).toFixed(2) + '元'
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="盈亏类型" align="center" prop="reasonCode_dictText" />
+        <el-table-column label="盈亏原因" align="center" prop="reason" />
+      </el-table>
+      <div>
+        <span>合计盈亏金额：{{ totalAmount ? totalAmount.toFixed(4) : 0 }}</span>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getCurrentInstance } from 'vue';
+import { getstocktakingDetail, productStocktakingApproved, reject } from './api';
+import templateJson from '@/views/medicationmanagement/chkstock/chkstockPart/components/template.json';
+import { hiprint } from 'vue-plugin-hiprint';
+import useUserStore from '@/store/modules/user';
+
+const detailsList = ref([]);
+const dialogVisible = ref(false);
+const loading = ref(false);
+const totalAmount = ref(0);
+const supplyBusNo = ref('');
+const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  isApply: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+function open(busNo) {
+  dialogVisible.value = true;
+  supplyBusNo.value = busNo;
+  getstocktakingDetail({ busNo: busNo, pageSize: 1000, pageNo: 1 }).then((res) => {
+    detailsList.value = res.data.records;
+    totalAmount.value = res.data.records.reduce((accumulator, currentRow) => {
+      return accumulator + (Number(((currentRow.itemQuantity * currentRow.price) / currentRow.partPercent).toFixed(2)) || 0);
+    }, 0);
+  });
+}
+
+function formatQuantity(quantity, row) {
+  if (row.measurementUnitCode == row.unitCode) {
+    return formatInventory(
+      quantity,
+      row.partPercent,
+      row.unitCode_dictText,
+      row.minUnitCode_dictText
+    );
+  } else {
+    return quantity + row.minUnitCode_dictText;
+  }
+}
+
+function handelApply() {
+  loading.value = true;
+  productStocktakingApproved(supplyBusNo.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      loading.value = false;
+    }
+  });
+}
+
+function handleReject() {
+  reject(supplyBusNo.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+  });
+}
+
+/**
+ * 格式化库存数量显示(大单位情况)
+ * @param quantity 小单位库存数量
+ * @param partPercent 拆零比
+ * @param unitCode 大单位
+ * @param minUnitCode 小单位
+ */
+function formatInventory(quantity, partPercent, unitCode, minUnitCode) {
+  // 处理负数情况
+  const isNegative = quantity < 0;
+  const absQuantity = Math.abs(quantity);
+
+  if (absQuantity % partPercent !== 0) {
+    const integerPart = Math.floor(absQuantity / partPercent);
+    const decimalPart = absQuantity % partPercent;
+
+    let result = integerPart.toString() + ' ' + unitCode;
+    if (decimalPart > 0) {
+      result += decimalPart.toString() + ' ' + minUnitCode;
+    }
+
+    return isNegative ? '-' + result : result;
+  }
+
+  // 整除情况
+  const result = absQuantity / partPercent + ' ' + unitCode;
+  return isNegative ? '-' + result : result;
+}
+
+// 打印盘点单
+function handlePrint() {
+  const result = [];
+  const printList = detailsList.value.map((item) => {
+    return {
+      ...item,
+      name: item.itemName,
+      volume: item.totalVolume,
+      price: Number(item.price).toFixed(2),
+      itemQuantity: formatQuantity(item.itemQuantity, item),
+      profitAmount: ((item.itemQuantity * item.price) / item.partPercent).toFixed(2),
+    };
+  });
+  result.push({
+    purposeLocationName: printList[0].purposeLocationName,
+    name: userStore.name,
+    // totalAmount: totalAmount.value.toFixed(2),
+    occurrenceTime: proxy.formatDateStr(printList[0].occurrenceTime, 'YYYY-MM-DD HH:mm:ss'),
+    busNo: printList[0].busNo,
+    purposeLocationName: printList[0].purposeLocationName,
+    purchaseinventoryList: printList,
+  });
+  const printElements = templateJson;
+  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  hiprintTemplate.print2(result, {
+    // printer: 'EPSON LQ-80KFII',
+    title: '打印标题',
+  }); //开始打印
+}
+// 导出
+function handleExport() {
+  proxy.downloadGet(
+    '/inventory-manage/stocktaking/excel-out',
+    {
+      busNo: supplyBusNo.value,
+    },
+    `盘点单明细_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
+  );
+}
+defineExpose({
+  open,
+});
+</script>
--- a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/components/medicineList.vue
@@ -40,12 +40,6 @@
        label="产品批号"
        align="center"
        prop="lotNumber"
-      />
-        <el-table-column
-          label="包装单位"
-          align="center"
-          prop="unitCode_dictText"
-         :show-overflow-tooltip="true"
      />
      <!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
      <el-table-column label="单次剂量" align="center" prop="dose" />
@@ -54,7 +48,7 @@
        align="center"
        prop="doseUnitCode_dictText"
      /> -->
-      <el-table-column label="生产厂家" align="center" prop="manufacturer" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
      <el-table-column
        label="编码"
        align="center"