From ce2570f8555ff6668da4f149521b4620bdd9d8bf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:25:22 +0800
Subject: [PATCH] feat(order): 添加订单委托要求字段并优化界面流程 - 新增分包内容、样品处置、结果评价、报告交付方式等委托要求字段 - 添加分包单位信息、报告寄送地址、收件人电话等关联信息录入功能 - 更新订单状态标签，新增作废状态和全部状态页签 - 调整报告准备页面审批流程，防止审核人和批准人为同一人
---
src/views/CNAS/process/demand/index.vue | 101 +-------------------------------------------------
1 files changed, 2 insertions(+), 99 deletions(-)
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index 7bf37d2..8dc84a2 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -24,9 +24,6 @@
</el-form-item>
</el-form>
</div>
- <div style="text-align: right; margin-bottom: 10px">
- <el-button size="small" type="primary" @click="goAdd">鏂板</el-button>
- </div>
<div class="table">
<el-table v-loading="tableListLoading" :data="tableList"
height="630" border :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
@@ -72,32 +69,6 @@
@current-change="handleCurrentChange1">
</el-pagination>
</div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="orderRowsVisible"
- title="鏂板妫�楠屼换鍔″崟" width="1000px">
- <div style="display: flex; align-items: center;margin-bottom: 10px">
- <span style="width: 80px">濮旀墭缂栧彿锛�</span>
- <el-input v-model="entity.entrustCode" clearable size="small"
- style="width: 300px;margin-right: 10px"></el-input>
- <el-button size="small" type="primary" @click="searchTableData">鏌ヨ</el-button>
- <el-button size="small" @click="refreshTableData">閲� 缃�</el-button>
- </div>
- <el-table v-loading="tableLoading" :data="tableData"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- height="550" style="width: 100%">
- <el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
- <el-table-column label="濮旀墭缂栧彿" prop="entrustCode"></el-table-column>
- <el-table-column label="鏍峰搧鍚嶇О" prop="sample"></el-table-column>
- <el-table-column align="center" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button align="center" size="mini" type="text" @click="goAddOrder(scope.row)">鏂板濮旀墭鍗�</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination :current-page="1" :page-size="tableSearch.size" :page-sizes="[10, 20, 30, 50, 100]" :total="total"
- layout="->,total, sizes, prev, pager, next" style="margin-top: 10px" background @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
- </el-pagination>
- </el-dialog>
<el-dialog :class="{ downPdf: title == '涓嬭浇' }" :close-on-click-modal="false" :close-on-press-escape="false"
:modal="title != '涓嬭浇'" :title="title" :visible.sync="detailDialogVisible" top="20px" width="1200px">
<div style="max-height: 75vh;overflow-y: auto;">
@@ -386,8 +357,6 @@
</div>
<span v-if="operationType !== 'view'" slot="footer" class="dialog-footer">
<el-button @click="detailDialogVisible = false">鍙� 娑�</el-button>
- <el-button v-if="operationType === 'add'" :loading="buttonLoading" type="primary" @click="handleAdd">纭�
- 瀹�</el-button>
<el-button v-if="operationType === 'edit'" :loading="buttonLoading" type="primary" @click="handleEdit">纭�
瀹�</el-button>
</span>
@@ -406,8 +375,8 @@
<script>
import {
- addInspectionOrder, delInspectionOrder, exportInspectionOrder,
- getInsOrderOnInspection, getInspectionOrderByInsOderId, getInspectionOrderOne,
+ delInspectionOrder, exportInspectionOrder,
+ getInspectionOrderOne,
pageInspectionOrder,
updateInspectionOrder
} from "@/api/cnas/process/demand/demand";
@@ -449,7 +418,6 @@
},
],
operationType: '',
- orderRowsVisible: false,
tableList: [],
tableListLoading: false,
pages: {
@@ -528,47 +496,6 @@
}
this.refreshTable()
},
- // 鎵撳紑鏂板寮规
- goAdd() {
- this.operationType = 'add'
- this.title = '鏂板妫�楠屽鎵樺崟';
- this.orderRowsVisible = true
- this.searchTableData()
- },
- // 鏌ヨ鍙柊澧炵殑妫�楠屽崟
- searchTableData() {
- this.tableLoading = true
- getInsOrderOnInspection({
- ...this.tableSearch,
- ...this.entity
- }).then(res => {
- this.tableLoading = false
- this.tableData = res.data.records
- this.total = res.data.total
- }).catch(err => {
- this.tableLoading = false
- })
- },
- // 閲嶇疆妫�楠屽崟鍒楄〃
- refreshTableData() {
- this.entity = {
- entrustCode: ''
- }
- this.tableSearch = {
- current: 1,
- size: 20,
- }
- this.searchTableData()
- },
- // 妫�楠屽崟鍒楄〃鍒嗛〉
- handleSizeChange(val) {
- this.tableSearch.size = val
- this.searchTableData();
- },
- handleCurrentChange(val) {
- this.tableSearch.current = val
- this.searchTableData();
- },
// 鍒楄〃鍒嗛〉
handleSizeChange1(val) {
this.pages.size = val
@@ -578,19 +505,6 @@
this.pages.current = val
this.refreshTable();
},
- // 鎻愪氦鏂板
- handleAdd() {
- this.buttonLoading = true
- addInspectionOrder(this.currentInfo).then(res => {
- this.buttonLoading = false
- this.$message.success('鏂板鎴愬姛')
- this.detailDialogVisible = false
- this.orderRowsVisible = false
- this.refreshTable()
- }).catch(err => {
- this.buttonLoading = false
- })
- },
// 鎻愪氦淇敼
handleEdit() {
this.buttonLoading = true
@@ -598,20 +512,9 @@
this.buttonLoading = false
this.$message.success('鏂板鎴愬姛')
this.detailDialogVisible = false
- this.orderRowsVisible = false
this.refreshTable()
}).catch(err => {
this.buttonLoading = false
- })
- },
- // 鏌ヨ闇�瑕佹柊澧炵殑濮旀墭鍗曡鎯�
- goAddOrder(row) {
- getInspectionOrderByInsOderId({ insOrderId: row.id }).then(res => {
- this.currentInfo = res.data
- this.title = '鏂板妫�楠屽鎵樺崟';
- this.detailDialogVisible = true
- }).catch(err => {
- console.log('err----', err)
})
},
// 鎵撳紑缂栬緫寮规
--
Gitblit v1.9.3