Revert "```"

This reverts commit abc0674531.
This commit is contained in:
2025-12-26 22:21:21 +08:00
parent ae6c486114
commit 3115e38cc4
920 changed files with 14452 additions and 107025 deletions

View File

@@ -54,7 +54,7 @@
align="center"
prop="doseUnitCode_dictText"
/> -->
<el-table-column label="生产厂家" align="center" prop="manufacturerText" />
<el-table-column label="生产厂家" align="center" prop="manufacturer" />
<el-table-column
label="编码"
align="center"

View File

@@ -44,7 +44,7 @@
<el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
</el-col>
</el-row>
<el-button type="primary" plain @click="handleExport" v-if="viewStatus == 'view'">导出</el-button>
<el-form
:model="receiptHeaderForm"
ref="receiptHeaderRef"
@@ -229,17 +229,17 @@
<el-table-column
label="厂家/产地"
align="center"
key="manufacturerText"
prop="manufacturerText"
key="manufacturer"
prop="manufacturer"
:show-overflow-tooltip="true"
width="240"
>
<template #default="scope">
<el-form-item
:prop="`purchaseinventoryList.${scope.$index}.manufacturerText`"
:rules="tableRules.manufacturerText"
:prop="`purchaseinventoryList.${scope.$index}.manufacturer`"
:rules="tableRules.manufacturer"
>
<el-input v-model="scope.row.manufacturerText" placeholder="" disabled />
<el-input v-model="scope.row.manufacturer" placeholder="" disabled />
</el-form-item>
</template>
</el-table-column>
@@ -751,7 +751,7 @@ function addNewRow() {
itemType: '',
itemType_enumText: '',
lotNumber: '',
manufacturerText: '',
manufacturer: '',
minUnitCode: '',
minUnitCode_dictText: '',
name: '',
@@ -878,7 +878,7 @@ function getTransferProductDetails() {
form.purchaseinventoryList[index].statusMaxvalue = false;
e.volume = e.totalVolume;
e.name = e.itemName;
e.manufacturerText = e.manufacturerText;
e.manufacturer = e.manufacturerText;
e.lossReason = e.reason;
if (e.purposeTypeEnum) {
warehous_type.value.map((item) => {
@@ -1023,7 +1023,7 @@ function handleReject() {
store.clearCurrentDataBS();
// 跳转到审核页面
router.replace({
path: '/aaaa/billapproval',
path: '/aaaa/medicationmanagement/billapproval',
query: { type: 'lossReporting' },
});
}
@@ -1039,7 +1039,7 @@ function handelApply() {
store.clearCurrentDataBS();
// 跳转到审核页面
router.replace({
path: '/aaaa/billapproval',
path: '/aaaa/medicationmanagement/billapproval',
query: { type: 'lossReporting' },
});
}
@@ -1095,7 +1095,7 @@ function selectRow(rowValue, index) {
form.purchaseinventoryList[index].volume = rowValue.volume;
form.purchaseinventoryList[index].minUnitCode = rowValue.minUnitCode;
form.purchaseinventoryList[index].unitCode = rowValue.unitCode;
form.purchaseinventoryList[index].manufacturerText = rowValue.manufacturerText;
form.purchaseinventoryList[index].manufacturer = rowValue.manufacturer;
form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
@@ -1552,7 +1552,7 @@ function edit() {
...item,
name: item.itemName,
volume: item.volume,
manufacturerText: item.supplierName,
manufacturer: item.supplierName,
totalQuantity: item.totalQuantity,
totalPurposeQuantity: item.totalPurposeQuantity,
startTime: formatDateymd(item.startTime),
@@ -1655,22 +1655,6 @@ getTransferProductDetails();
// show,
// edit,
// });
// 导出
const exportRequiredParams = ref({
pageNo: 1,
pageSize: 10,
busNo: route.query.supplyBusNo
});
function handleExport() {
proxy.downloadGet(
'/inventory-manage/loss/excel-out',
{
...exportRequiredParams.value,
},
`报损单据明细_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
);
}
</script>
<style scoped>
.custom-tree-node {