From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
src/views/CNAS/process/disposal/sampleReceipt/index.vue | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/views/CNAS/process/disposal/sampleReceipt/index.vue b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
index 8ea9309..a15d35a 100644
--- a/src/views/CNAS/process/disposal/sampleReceipt/index.vue
+++ b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
@@ -18,7 +18,7 @@
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading0"
key="tableData0"
- :height="'calc(100vh - 240px)'" :page="page0" @pagination="pagination0">
+ :height="150" :page="page0" @pagination="pagination0">
<div slot="action" slot-scope="scope">
<el-button type="text" @click="handleAdd(scope.row)">缂栬緫</el-button>
<el-button type="text" @click="delRow(scope.row)">
@@ -30,6 +30,16 @@
<!-- 鏂板鏍峰搧 -->
<el-dialog :title="title" :visible.sync="addDialogVisible" width="400px">
<el-row>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">鏀舵牱鏃ユ湡锛�</div>
+ <div class="search_input">
+ <el-date-picker v-model="addInfo.receiveDate" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </div>
+ </el-col>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
@@ -46,7 +56,15 @@
</el-col>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
- <div class="search_label">渚涙牱鍗曚綅锛�</div>
+ <div class="search_label">鏁伴噺锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addInfo.num"></el-input>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">鏉ユ牱鍗曚綅锛�</div>
<div class="search_input">
<el-select v-model="addInfo.sampleSupplier" size="small">
<el-option :label="item.company" :value="item.company" v-for="(item, index) in customPageList"
@@ -57,29 +75,31 @@
</el-col>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
- <div class="search_label">鏁伴噺锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="addInfo.num"></el-input>
- </div>
- </div>
- </el-col>
- <el-col :span="24" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">澶勭悊鏂瑰紡锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="addInfo.dealMethod"></el-input></div>
- </div>
- </el-col>
- <el-col :span="24" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">鏃堕棿锛�</div>
+ <div class="search_label">鐣欐牱鏃ユ湡锛�</div>
<div class="search_input">
- <el-date-picker v-model="addInfo.dealTime" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ <el-date-picker v-model="addInfo.leaveDate" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" style="width: 100%;">
</el-date-picker>
</div>
</div>
</el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鐘舵�侊細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addInfo.sampleState"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">澶勭悊鏃ユ湡锛�</div>
+ <div class="search_input">
+ <el-date-picker v-model="addInfo.dealTime" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </div>
+ </el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="addDialogVisible = false">鍙� 娑�</el-button>
@@ -109,7 +129,6 @@
addProcessSample,
exportProcessSample
} from "@/api/cnas/process/sampleDisposal";
-import {exportInconsistentDistribution} from "@/api/cnas/process/nonconformingWork";
export default {
name: 'SampleReceipt',
components: {
--
Gitblit v1.9.3