From ea57c9f90d4d5a7698257c7cdf7d681fc91f432b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 25 二月 2026 15:34:48 +0800
Subject: [PATCH] 成品抽样：分页问题修复
---
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 4 ++++
src/main.js | 2 +-
src/views/business/finishedProductSampling/index.vue | 35 +++++++++++++++++++++++++++--------
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main.js b/src/main.js
index 16962eb..78d6bf8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -65,7 +65,7 @@
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
-Vue.prototype.javaApi = "http://192.168.21.53:8001/lims";
+Vue.prototype.javaApi = process.env.NODE_ENV === "production"?"http://192.168.21.53:8001/lims":"http://127.0.0.1:8001";
Vue.prototype.checkPermi = checkPermi;
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + getToken(),
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 2bcb6aa..c8a60ba 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -520,6 +520,8 @@
this.timer = setTimeout(() => {
this.closeUploadDia()
}, 1000)
+ }else{
+ this.$message.error(response.msg)
}
},
splitList(val) {
@@ -547,6 +549,8 @@
// 鍏抽棴瀵煎叆寮规
closeUploadDia() {
this.uploadDia = false;
+ this.uploading = false
+ this.$refs.upload1.clearFiles()
this.recordUserIds = []
this.ratifyUserId = ''
this.superviseYear = ''
diff --git a/src/views/business/finishedProductSampling/index.vue b/src/views/business/finishedProductSampling/index.vue
index e013681..52e4e27 100644
--- a/src/views/business/finishedProductSampling/index.vue
+++ b/src/views/business/finishedProductSampling/index.vue
@@ -8,6 +8,7 @@
<el-button size="small" type="primary" @click="handleStockList">鍒锋柊</el-button>
</div>
<el-table
+ border
ref="finishedproducttransferTable"
v-loading="tableLoading"
:data="stockList"
@@ -18,12 +19,14 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="45"></el-table-column>
+ <el-table-column type="index" label="搴忓彿" align="center" width="60"></el-table-column>
<el-table-column
- :show-overflow-tooltip="true"
align="center"
label="瀹㈡埛璁㈠崟缂栧彿"
prop="customerOrderNo"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">瀹㈡埛璁㈠崟缂栧彿</div>
@@ -46,7 +49,9 @@
align="center"
label="鎴愬搧闆朵欢鍙�"
prop="partNo"
- width="140"
+ width="160"
+ min-width="160"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鎴愬搧闆朵欢鍙�</div>
@@ -69,7 +74,8 @@
align="center"
label="闆朵欢鍚嶇О"
prop="partName"
- width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">闆朵欢鍚嶇О</div>
@@ -89,11 +95,12 @@
</template>
</el-table-column>
<el-table-column
- :show-overflow-tooltip="true"
align="center"
label="浠撳簱"
prop="warehouseName"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">浠撳簱</div>
@@ -113,11 +120,12 @@
</template>
</el-table-column>
<el-table-column
- :show-overflow-tooltip="true"
align="center"
label="搴撲綅鍙�"
prop="locationNo"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">搴撲綅鍙�</div>
@@ -137,11 +145,12 @@
</template>
</el-table-column>
<el-table-column
- :show-overflow-tooltip="true"
align="center"
label="搴撲綅鍚嶇О"
prop="locationName"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">搴撲綅鍚嶇О</div>
@@ -164,7 +173,9 @@
align="center"
label="鎵规鍙�"
prop="partBatchNo"
- width="140"
+ width="180"
+ min-width="180"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鎵规鍙�</div>
@@ -188,6 +199,8 @@
label="鍏ュ簱鏉ユ簮"
prop="inSource"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鍏ュ簱鏉ユ簮</div>
@@ -211,6 +224,8 @@
label="澶栨姢棰滆壊"
prop="outerColor"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">澶栨姢棰滆壊</div>
@@ -234,6 +249,8 @@
label="搴撳瓨鏁伴噺"
prop="stockQuantity"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
</el-table-column>
<el-table-column
@@ -241,6 +258,8 @@
label="鍙敤搴撳瓨鏁伴噺"
prop="availableStockQuantity"
width="140"
+ min-width="140"
+ show-overflow-tooltip
>
<template slot-scope="scope">
<span>{{ scope.row.availableStockQuantity }}</span>
@@ -354,7 +373,7 @@
getIfsStock(newReqParam).then((response) => {
this.tableLoading = false
const resData = response.data
- this.queryReport.total = resData.total
+ this.queryReport.total = resData.count
const resStockList = resData.data
resStockList.forEach((item) => {
this.stockList.push({
--
Gitblit v1.9.3