From 7b7accc4ce1c1ccfc7a006980e1d3e4d0fbc56e8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 06 一月 2026 16:57:33 +0800
Subject: [PATCH] 双奇点 1.编辑采购台账时，删除产品时，弹出两个提示需修改下 2.采购台账添加附件操作按钮和页面
---
src/views/inventoryManagement/receiptManagement/index.vue | 895 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 507 insertions(+), 388 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 7f877fa..16af5cd 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -1,98 +1,224 @@
<template>
<div class="app-container">
- <div class="search_form">
- <div>
- <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
- <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
- clearable prefix-icon="Search" />
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
- </div>
- <div>
- <el-button type="primary" @click="openForm('add')">鏂板鍏ュ簱</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- </div>
- </div>
- <div class="table_list">
- <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
- :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
- :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
- <el-table-column align="center" type="selection" width="55" />
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundTime" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatch" width="160" show-overflow-tooltip />
- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="productName" width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" width="160" show-overflow-tooltip />
- <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundQuantity" width="90" show-overflow-tooltip />
- <el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />
- <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />
- <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" show-overflow-tooltip />
- <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱浜�" prop="nickName" width="80" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
- :page="page.current" :limit="page.size" @pagination="paginationChange" />
- </div>
- <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'" width="70%"
- @close="closeDia">
- <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
- <el-form-item label="閲囪喘璁㈠崟鍙�" prop="salesContractNo">
- <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- <el-table
- :data="productData"
- border
- @selection-change="productSelected"
- >
- <el-table-column align="center" type="selection" width="55" />
- <el-table-column
- align="center"
- label="搴忓彿"
- type="index"
- width="60"
- />
- <el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
- <el-table-column label="鍗曚綅" prop="unit" width="70" />
- <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
- <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
- <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="120">
+ <el-tabs v-model="activeTab" @tab-change="handleTabChange">
+ <el-tab-pane label="閲囪喘鍏ュ簱" name="purchase">
+ <div class="search_form">
+ <div>
+ <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
+ <el-date-picker
+ v-model="searchForm.timeStr"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ @change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+ </div>
+ <div>
+ <el-button type="primary" @click="openForm('add', 'purchase')">鏂板鍏ュ簱</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ </div>
+ </div>
+ <div class="table_list">
+ <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+ :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
+ :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
+ <el-table-column align="center" type="selection" width="55" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
+ <el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
+ <el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
<template #default="scope">
- <el-input v-model="scope.row.quantityStock" type="number" :min="0" :max="scope.row.quantity0" />
+ <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
</template>
</el-table-column>
- <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
- <el-table-column
- label="鍚◣鍗曚环(鍏�)"
- prop="taxInclusiveUnitPrice"
- :formatter="formattedNumber"
- width="150"
- />
- <el-table-column
- label="鍚◣鎬讳环(鍏�)"
- prop="taxInclusiveTotalPrice"
- :formatter="formattedNumber"
- width="150"
- />
- <el-table-column
- label="涓嶅惈绋庢�讳环(鍏�)"
- prop="taxExclusiveTotalPrice"
- :formatter="formattedNumber"
- width="150"
- />
- </el-table>
- </el-form>
+ <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚环(鍏�)/浠�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+ <el-table-column label="鍏ュ簱浜�" prop="createBy" width="120" show-overflow-tooltip />
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+ <template #default="scope">
+ <el-button link type="primary" size="small" @click="openForm('edit', scope.row, 'purchase');">缂栬緫</el-button>
+ <!-- <el-button link type="success" size="small" @click="showQRCode(scope.row,1)">鐢熸垚鏉″舰鐮�</el-button>
+ <el-button link type="success" size="small" @click="showERCode(scope.row,1)">鐢熸垚浜岀淮鐮�</el-button> -->
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current" :limit="page.size" @pagination="paginationChange" />
+ </div>
+ </el-tab-pane>
+
+ <el-tab-pane label="鎴愬搧鍏ュ簱" name="manual">
+ <div class="search_form">
+ <div>
+ <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
+ <el-date-picker
+ v-model="searchForm.timeStr"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ @change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+ </div>
+ <div>
+ <el-button type="primary" @click="openForm('add', 'manual')">鏂板鍏ュ簱</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ </div>
+ </div>
+ <div class="table_list">
+ <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+ :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
+ :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
+ <el-table-column align="center" type="selection" width="55" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="浜у搧鍥剧墖" width="100" align="center">
+ <template #default="scope">
+ <img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" show-overflow-tooltip />
+ <el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
+ <el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
+ <template #default="scope">
+ <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍏ュ簱鏁伴噺/浠�" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚环(鍏�)/浠�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+ <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
+ <el-table-column label="鍏ュ簱浜�" prop="createBy" width="150" show-overflow-tooltip />
+ <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
+ <template #default="scope">
+ <el-button link type="primary" size="small" @click="openForm('edit', scope.row, 'manual');">缂栬緫</el-button>
+ <el-button link type="success" size="small" @click="showQRCode(scope.row,2)">鐢熸垚鏉″舰鐮�</el-button>
+ <el-button link type="success" size="small" @click="showERCode(scope.row,2)">鐢熸垚浜岀淮鐮�</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current" :limit="page.size" @pagination="paginationChange" />
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+
+ <form-dia ref="formDia" @close="handleQuery" @success="handleQuery"></form-dia>
+ <form-dia-manual ref="formDiaManual" @close="handleQuery" @success="handleQuery"></form-dia-manual>
+ <form-dia-product ref="formDiaProduct" @close="handleQuery" @success="handleQuery"></form-dia-product>
+ <el-dialog
+ v-model="qrCodeDialogVisible"
+ title="鍟嗗搧鏉″舰鐮�"
+ width="400px"
+ center
+ >
+ <div style="text-align: center;">
+ <img id="barcode" style="width:200px;height: 50px;"/>
+ <!-- <img :src="qrCodeUrl" alt="浜岀淮鐮�" style="width:200px;height:200px;" /> -->
+ <div style="margin: 20px;">
+ <el-button type="primary" @click="downloadQRCode">涓嬭浇鏉″舰鐮�</el-button>
+ </div>
+ </div>
+ </el-dialog>
+ <!-- 浜岀淮鐮佹樉绀哄璇濇 -->
+ <el-dialog
+ v-model="erCodeDialogVisible"
+ title="鍟嗗搧浜岀淮鐮�"
+ width="400px"
+ center
+ >
+ <div style="text-align: center;">
+ <img :src="erCodeUrl" alt="浜岀淮鐮�" style="width:200px;height:200px;" />
+ <div style="margin: 20px;">
+ <el-button type="primary" @click="downloadERCode">涓嬭浇浜岀淮鐮佸浘鐗�</el-button>
+ </div>
+ </div>
+ </el-dialog>
+ <el-dialog v-model="barcodeDia" title="浜у搧淇℃伅" width="40%" @close="closeBarcodeDia">
+ <div>
+ <el-row v-if="barcodeDetail.url" :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鍥剧墖</div>
+ <img class="barcode-img" :src="javaApiUrl+barcodeDetail.url"></img>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鍚嶇О</div>
+ <div class="barcode-value">{{barcodeDetail.productCategory}}</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">浜у搧楂樺害</div>
+ <div class="barcode-value">{{barcodeDetail.specificationModel}}{{barcodeDetail.unit}}</div>
+ </div>
+ </el-col>
+
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鍗曚环</div>
+ <div class="barcode-value">{{barcodeDetail.taxInclusiveUnitPrice}}缇庡厓/浠�</div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鏁伴噺/浠�</div>
+ <div class="barcode-value">{{barcodeDetail.inboundNum}}</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">姣忎欢鏁伴噺/鏀�</div>
+ <div class="barcode-value">{{barcodeDetail.boxNum}}</div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">绾哥瑙勬牸</div>
+ <div class="barcode-value">{{barcodeDetail.cartonSpecifications}}</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鍏ュ簱浜�</div>
+ <div class="barcode-value">{{barcodeDetail.createBy}}</div>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
- <el-button @click="closeDia">鍙栨秷</el-button>
+ <el-button @click="closeBarcodeDia">鍏抽棴</el-button>
</div>
</template>
</el-dialog>
@@ -101,89 +227,54 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref } from 'vue'
+import { ref, reactive, toRefs, onMounted, getCurrentInstance, nextTick } from 'vue'
import { ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
+import dayjs from 'dayjs'
+const javaApiUrl = __BASE_API__;
import {
- getStockInPage,
- updateStockIn,
- addSutockIn,
- delStockIn,
- exportStockIn
+ getStockInPage,
+ getStockInPageByProduction,
+ delStockIn,
+ delStockInCustom, getInPageByCustom,
+ stockinDetail,detailManagementByCustom
} from "@/api/inventoryManagement/stockIn.js";
-import {listSupplier} from "@/api/basicData/supplierManageFile.js";
-import {modelListPage, productTreeList} from "@/api/basicData/product.js";
-const userStore = useUserStore()
+import FormDia from './components/formDia.vue'
+import FormDiaManual from './components/formDiaManual.vue'
+import FormDiaProduct from './components/formDiaProduct.vue'
+import QRCode from "qrcode";
+import JsBarcode from "jsbarcode";
+
+// 鑾峰彇褰撳墠鏃ユ湡
+function getCurrentDate() {
+ return dayjs().format('YYYY-MM-DD')
+}
+
const { proxy } = getCurrentInstance()
+
const tableData = ref([])
const selectedRows = ref([])
-const userList = ref([])
-const supplierLists = ref([])
-const productList = ref([]);
-const productModelList = ref([]);
-const purchaseRecords = ref([]);
-const loadingProducts = ref(false);
-
-const loading = ref(false);
const tableLoading = ref(false)
+const formDia = ref()
+const formDiaManual = ref()
+const formDiaProduct = ref()
+const activeTab = ref('purchase') // 褰撳墠婵�娲荤殑 tab
+
const page = reactive({
current: 1,
size: 100,
})
const total = ref(0)
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
-const dialogFormVisible = ref(false)
const data = reactive({
searchForm: {
supplierName: '',
+ customerName: '',
+ productCategory:'',
+ timeStr: getCurrentDate(),
},
- form: {
- supplierId: null,
- supplierName: '',
- productId: null,
- productName: '',
- userId: userStore.userId,
- nickName: '',
- model: '',
- productModelId: null,
- unit: '',
- productrecordId: null,
- taxInclusiveUnitPrice: '',
- taxInclusiveTotalPrice: '',
- taxRate: '',
- taxExclusiveTotalPrice: '',
- inboundTime: '',
- inboundBatch: '',
- inboundQuantity: ''
- },
- rules: {
- productId: [
- { required: true, message: "璇烽�夋嫨浜у搧澶х被", trigger: "change" }
- ],
- productModelId: [
- { required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" }
- ],
- supplierId: [
- { required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }
- ],
- inboundQuantity: [
- { required: true, message: "璇疯緭鍏ュ叆搴撴暟閲�", trigger: "blur" }
- ],
- userId: [
- { required: true, message: "璇烽�夋嫨鍏ュ簱浜�", trigger: "change" }
- ],
- unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- inboundBatch: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- }
})
-const { searchForm, form, rules } = toRefs(data)
-
+const { searchForm } = toRefs(data)
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -197,292 +288,320 @@
}
const getList = () => {
tableLoading.value = true
- getStockInPage({ ...searchForm.value, ...page }).then(res => {
+ const params = { ...page }
+
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷浼犻�掍笉鍚岀殑鏌ヨ鍙傛暟
+ if (activeTab.value === 'production') {
+ params.customerName = searchForm.value.customerName
+ params.timeStr = searchForm.value.timeStr
+ } else {
+ params.supplierName = searchForm.value.supplierName
+ params.timeStr = searchForm.value.timeStr
+ }
+ params.productCategory = searchForm.value.productCategory
+
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
+ const apiCall = activeTab.value === 'production'
+ ? getStockInPageByProduction(params)
+ : activeTab.value === 'manual'
+ ? getInPageByCustom(params)
+ : getStockInPage(params)
+
+ apiCall.then(res => {
tableLoading.value = false
tableData.value = res.data.records
- ttotal.value = res.data.total
+
+ // 鍓嶇璁＄畻鎬讳环锛氭�讳环 = unitPrice * inboundNum
+ tableData.value = tableData.value.map(item => {
+ // 浣跨敤鍏ュ簱鏁伴噺璁＄畻鎬讳环
+ const inboundNum = Number(item.inboundNum) || 0
+ const unitPrice = Number(item.unitPrice) || 0
+ const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0
+
+ // 鏍规嵁鏍囩椤电被鍨嬭绠椾笉鍚岀殑鎬讳环
+ if (activeTab.value === 'production') {
+ // 鎴愬搧搴撳瓨锛氭�讳环 = unitPrice * 鍏ュ簱鏁伴噺
+ item.totalPrice = (unitPrice * inboundNum).toFixed(2)
+ } else {
+ // 鍘熸枡鍜屾潗鏂欏簱瀛橈細鍚◣鎬讳环 = taxInclusiveUnitPrice * 鍏ュ簱鏁伴噺
+ item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2)
+ }
+
+ return item
+ })
+
+ total.value = res.data.total
}).catch(() => {
tableLoading.value = false
})
}
-// 姝ｇ‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉�
-const loadProductList = async () => {
- loadingProducts.value = true;
- try {
- const res = await productTreeList();
-
- // 鎵佸钩鍖栧鐞嗕骇鍝佹爲
- const flattenProducts = (nodes, parentId = null) => {
- let result = [];
- nodes.forEach(node => {
- // 鍙坊鍔犳湁id鍜宭abel鐨勮妭鐐�
- if (node.id && node.label) {
- result.push({
- id: node.id,
- productName: node.label,
- parentId: parentId
- });
- }
- // 閫掑綊澶勭悊瀛愯妭鐐�
- if (node.children) {
- result = result.concat(flattenProducts(node.children, node.id));
- }
- });
- return result;
- };
-
- productList.value = flattenProducts(res.data);
- console.log('鍔犺浇鐨勪骇鍝佸垪琛�:', productList.value);
- } catch (error) {
- console.error('鍔犺浇浜у搧鍒楄〃澶辫触:', error);
- proxy.$modal.msgError('鍔犺浇浜у搧鍒楄〃澶辫触');
- } finally {
- loadingProducts.value = false;
- }
- return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
-};
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
-
-// 鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
-const loadProductModels = async (productId) => {
- if (!productId) {
- productModelList.value = [];
- return;
- }
-
- try {
- const res = await modelListPage({
- id: productId,
- current: 1,
- size: 100
- });
-
- productModelList.value = res.data.records.map(item => ({
- id: item.id,
- model: item.model,
- unit: item.unit
- }));
-
- } catch (error) {
- console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
- proxy.$modal.msgError('鍔犺浇瑙勬牸鍨嬪彿澶辫触');
- }
-};
-
-// 浜у搧閫夋嫨鍙樺寲
-const handleProductChange = (productId) => {
- form.value.productModelId = null
- form.value.productrecordId = null
- resetPurchaseFields()
- if (productId) {
- loadProductModels(productId)
- } else {
- productModelList.value = []
- }
-}
-
-// 瑙勬牸鍨嬪彿閫夋嫨鍙樺寲
-const handleModelChange = async (modelId) => {
- if (!form.value.productId || !modelId) return
-
- try {
- // 鏍规嵁浜у搧ID鍜屽瀷鍙稩D鏌ヨ閲囪喘璁板綍
- const res = await getPurchaseRecords({
- productId: form.value.productId,
- productModelId: form.value.productModelId,
- type: 2 // 鍋囪2琛ㄧず宸叉壒鍑嗙殑閲囪喘璁板綍
- })
-
- purchaseRecords.value = res.data.records
-
- if (purchaseRecords.value.length > 0) {
- // 榛樿鍙栫涓�鏉￠噰璐褰�
- const record = purchaseRecords.value[0]
- fillFormFromPurchaseRecord(record)
- }
- } catch (error) {
- console.error('鏌ヨ閲囪喘璁板綍澶辫触:', error)
- proxy.$modal.msgError('鏌ヨ閲囪喘璁板綍澶辫触')
- }
-}
-
-// 浠庨噰璐褰曞～鍏呰〃鍗�
-const fillFormFromPurchaseRecord = (record) => {
- form.value.productrecordId = record.id
- form.value.taxInclusiveUnitPrice = record.taxInclusiveUnitPrice
- form.value.taxRate = record.taxRate
- form.value.taxInclusiveTotalPrice = record.taxInclusiveTotalPrice
- form.value.taxExclusiveTotalPrice = record.taxExclusiveTotalPrice
-}
-
-// 閲嶇疆閲囪喘鐩稿叧瀛楁
-const resetPurchaseFields = () => {
- form.value.productrecordId = null
- form.value.unit = ''
- form.value.taxInclusiveUnitPrice = null
- form.value.taxRate = null
- form.value.taxInclusiveTotalPrice = null
- form.value.taxExclusiveTotalPrice = null
-}
-
-const loadUserList = async () => {
- try {
- const res = await userListNoPage()
- userList.value = res.data
- } catch (error) {
- console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
- }
-}
-
-const loadSupplierList = async () => {
- try {
- const res = await listSupplier()
- supplierLists.value = res.data.records
- } catch (error) {
- console.error('鍔犺浇渚涘簲鍟嗗垪琛ㄥけ璐�:', error)
- }
+// 鍒囨崲 tab
+const handleTabChange = (tabName) => {
+ page.current = 1
+ // 鍒囨崲 tab 鏃舵竻绌烘悳绱㈡潯浠�
+ searchForm.value.supplierName = ''
+ searchForm.value.customerName = ''
+ searchForm.value.timeStr = getCurrentDate() // 閲嶇疆涓哄綋鍓嶆棩鏈�
+ searchForm.value.productCategory = ''
+ getList()
}
// 鎵撳紑寮规
-const openForm = async (type, row) => {
- operationType.value = type
- dialogFormVisible.value = true
- // 鍔犺浇蹇呰鏁版嵁
- await Promise.all([
- loadUserList(),
- loadSupplierList(),
- loadProductList()
- ])
-
- if (type === 'add') {
- // 鏂板鏃堕噸缃〃鍗�
- form.value = {
- userId: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
+const openForm = async (type, row, tabType) => {
+ if(barcodeDia.value)return
+ const currentTab = tabType || activeTab.value
+ await nextTick(() => {
+ if (currentTab === 'manual') {
+ formDiaManual.value?.openDialog(type, row)
+ } else if (currentTab === 'production') {
+ formDiaProduct.value?.openDialog(type, row)
+ }else {
+ formDia.value?.openDialog(type, row)
}
- } else {
- // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
- form.value = { ...row ,
- supplierId: row.supplierId,
- productId: row.productId,
- productModelId: row.productModelId,
- userId: row.userId
- }
- if (row.productId) {
- await loadProductModels(row.productId)
- }
- }
+ })
}
-// 鎻愪氦琛ㄥ崟
-const submitForm = async () => {
- try {
- await proxy.$refs.formRef.validate()
-
- if (!form.value.productrecordId) {
- proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍')
- return
- }
-
- const submitData = {
- productrecordId: form.value.productrecordId,
- supplierId: form.value.supplierId,
- inboundQuantity: form.value.inboundQuantity,
- userId: form.value.userId,
- }
-
- const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
- await apiMethod(submitData)
-
- proxy.$modal.msgSuccess(operationType.value === 'add' ? '鏂板鎴愬姛' : '淇敼鎴愬姛')
- closeDia()
- getList()
- } catch (error) {
- console.error('鎻愪氦澶辫触:', error)
- if (!error.errors) {
- proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
- }
- }
-}
-// 鍏抽棴寮规
-const closeDia = () => {
- proxy.$refs.formRef.resetFields()
- dialogFormVisible.value = false
-}
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
- // 杩囨护鎺夊瓙鏁版嵁
- selectedRows.value = selection.filter(item => item.id);
- console.log('selection', selectedRows.value)
+ selectedRows.value = selection.filter(item => item.id)
}
+
const expandedRowKeys = ref([])
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = (param) => {
- return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
-};
+ return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice'])
+}
// 瀵煎嚭
const handleOut = () => {
- ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
- '瀵煎嚭', {
+ ElMessageBox.confirm('鏄惁纭瀵煎嚭锛�', '瀵煎嚭', {
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷',
type: 'warning',
- }
- ).then(() => {
- proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx')
+ }).then(() => {
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+ let exportUrl = "/stockin/export"
+ if (activeTab.value === 'production') {
+ exportUrl = "/stockin/exportOne"
+ } else if (activeTab.value === 'manual') {
+ exportUrl = "/stockin/exportTwo"
+ }
+ proxy.download(exportUrl, {}, '鍏ュ簱鍙拌处.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
}
+
// 鍒犻櫎
const handleDelete = () => {
- let ids = []
- if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map(item => item.id);
- } else {
+ if (selectedRows.value.length === 0) {
proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
return
}
- ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
- '瀵煎嚭', {
+ const ids = selectedRows.value.map(item => item.id)
+
+ ElMessageBox.confirm('閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�', '鍒犻櫎', {
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷',
type: 'warning',
- }
- ).then(() => {
- delStockIn(ids).then(res => {
+ }).then(() => {
+ // 鏍规嵁褰撳墠 tab 绫诲瀷閫夋嫨涓嶅悓鐨勫垹闄ゆ帴鍙ｅ拰type鍙傛暟
+ let deleteApi, deleteParams
+
+ if (activeTab.value === 'production') {
+ // 鎴愬搧鍒犻櫎锛宼ype浼�2
+ deleteApi = delStockIn
+ deleteParams = { ids, type: 2 }
+ } else if (activeTab.value === 'purchase') {
+ // 鍘熸枡鍒犻櫎锛宼ype浼�1
+ deleteApi = delStockIn
+ deleteParams = { ids, type: 1 }
+ } else {
+ // 鏉愭枡鍏ュ簱
+ deleteApi = delStockInCustom
+ deleteParams = [...ids]
+ }
+
+ deleteApi(deleteParams).then(() => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
getList()
+ }).catch(() => {
+ proxy.$modal.msgError("鍒犻櫎澶辫触")
})
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
}
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
- const today = new Date();
- const year = today.getFullYear();
- const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
- const day = String(today.getDate()).padStart(2, '0');
- return `${year}-${month}-${day}`;
+
+
+// 浜岀淮鐮佺浉鍏冲彉閲�
+const qrCodeDialogVisible = ref(false);
+const qrCodeUrl = ref("");
+const showQRCode = async (row,type) => {
+ if(barcodeDia.value)return
+ try {
+ // 鏋勫缓浜岀淮鐮佸唴瀹癸紝鍙寘鍚噰璐悎鍚屽彿锛堢函鏂囨湰锛�
+ let qrContent = row.id || '';
+ // 妫�鏌ュ唴瀹规槸鍚︿负绌�
+ if (!qrContent) {
+ proxy.$modal.msgWarning("璇ヨ鍟嗗搧id锛屾棤娉曠敓鎴愭潯褰㈢爜");
+ return;
+ }
+ qrContent+=`,${type}`
+ qrCodeDialogVisible.value = true;
+ await nextTick();
+ JsBarcode("#barcode", qrContent+'', {
+ width:10,
+ height:100,
+ displayValue: false
+ });
+ } catch (error) {
+ console.error('鐢熸垚鏉″舰鐮佸け璐�:', error);
+ proxy.$modal.msgError("鐢熸垚鏉″舰鐮佸け璐ワ細" + error.message);
+ }
+};
+
+const erCodeDialogVisible = ref(false);
+const erCodeUrl = ref("");
+const showERCode = async (row,type) => {
+ if(barcodeDia.value)return
+ let qrContent = row.id || '';
+ // 妫�鏌ュ唴瀹规槸鍚︿负绌�
+ if (!qrContent) {
+ proxy.$modal.msgWarning("璇ヨ鍟嗗搧id锛屾棤娉曠敓鎴愪簩缁寸爜");
+ return;
+ }
+ qrContent+=`,${type}`
+ try {
+ erCodeUrl.value = await QRCode.toDataURL(qrContent+'', {
+ width: 200,
+ margin: 2,
+ color: {
+ dark: '#000000',
+ light: '#FFFFFF'
+ }
+ });
+ erCodeDialogVisible.value = true;
+ } catch (error) {
+ console.error('鐢熸垚浜岀淮鐮佸け璐�:', error);
+ proxy.$modal.msgError("鐢熸垚浜岀淮鐮佸け璐ワ細" + error.message);
+ }
+};
+const downloadQRCode = () => {
+ const imgSrc = document.getElementById('barcode').src
+ const a = document.createElement('a');
+ if(!imgSrc){
+ proxy.$modal.msgWarning('鏆傛棤鏉″舰鐮�')
+ return
+ }
+ a.href = imgSrc;
+ a.download = `鍟嗗搧鏉″舰鐮乢${new Date().getTime()}.png`;
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ proxy.$modal.msgSuccess("涓嬭浇鎴愬姛");
+};
+
+// 涓嬭浇浜岀淮鐮�
+const downloadERCode = () => {
+ if (!erCodeUrl.value) {
+ proxy.$modal.msgWarning("浜岀淮鐮佹湭鐢熸垚");
+ return;
+ }
+
+ const a = document.createElement('a');
+ a.href = erCodeUrl.value;
+ a.download = `鍟嗗搧浜岀淮鐮乢${new Date().getTime()}.png`;
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ proxy.$modal.msgSuccess("涓嬭浇鎴愬姛");
+};
+
+//鎵爜鐩稿叧鍙傛暟
+const barcodeDia = ref(false);
+const scanBarcodeInput = ref('');
+const barcodeDetail = ref({})
+// 鎵爜鍑芥暟
+function scanBarcode (e){
+ if(!e||!e.target||!e.target.tagName){
+ return;
+ }
+ if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') {
+ return
+ }
+ if (e.key === 'Enter') {
+ let _value = scanBarcodeInput.value
+ getDetail(_value)
+ scanBarcodeInput.value = ""
+ } else {
+ scanBarcodeInput.value += e.key
+ }
+}
+const getDetail = (barcode)=>{
+ if(barcode.indexOf(",")==-1){
+ proxy.$modal.msgWarning("璇锋壂鎻忔纭殑鏉″舰鐮�")
+ return
+ }
+ let barcodeList = barcode.split(",")
+ let barcodeId = barcodeList[0]
+ let type = barcodeList[1]
+ let detailApi = null
+ if(type==1){
+ detailApi = stockinDetail
+ }else if(type==2){
+ detailApi = detailManagementByCustom
+ }
+
+ if(!detailApi){
+ proxy.$modal.msgWarning("璇锋壂鎻忔纭殑鏉″舰鐮�")
+ return
+ }
+ detailApi({id:barcodeId}).then((resp) => {
+ if(!resp.data){
+ proxy.$modal.msgError("鍟嗗搧涓嶅瓨鍦�")
+ return
+ }
+ if(resp.code!=200){
+ proxy.$modal.msgError(res.msg)
+ return
+ }
+ barcodeDetail.value = resp.data
+ barcodeDia.value = true
+ }).catch(() => {
+ proxy.$modal.msgError("鏌ョ湅璇︽儏澶辫触")
+ })
+
}
-const productSelectedRows = ref([])
-const productSelected = (selectedRows) => {
- productSelectedRows.value = selectedRows;
-};
+const closeBarcodeDia = () => {
+ barcodeDia.value = false
+}
-const formattedNumber = (row, column, cellValue) => {
- return parseFloat(cellValue).toFixed(2);
-};
onMounted(() => {
+ // 娣诲姞鎵爜鏋洃鍚簨浠�
+ document.removeEventListener('keypress',scanBarcode)
+ document.addEventListener('keypress', scanBarcode)
getList()
})
</script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.barcode-item{
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 0;
+
+}
+.barcode-img{
+ width: 80px;
+ height: 80px;
+ border-radius: 5px;
+ background-color: #F5F5F5;
+}
+</style>
+
+
+
--
Gitblit v1.9.3