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/business/inspectionTask/index.vue | 130 -------------------------------------------
1 files changed, 0 insertions(+), 130 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 5c66bd9..5cd38be 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -49,7 +49,6 @@
:rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
key="tableData0">
<div slot="action" slot-scope="scope">
- <el-button size="small" type="text" @click="handleDataLook(scope.row)">鏁版嵁鏌ョ湅</el-button>
<el-button type="text" size="small"
:disabled="(scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5) && checkPermi(['update:product:onPlan'])"
@click="editInspection(scope.row)">淇敼妫�楠屽��</el-button>
@@ -134,22 +133,6 @@
<el-button @click="connectVisible = false">鍙� 娑�</el-button>
<el-button :loading="loading" type="primary" @click="confirmConnect">纭� 瀹�</el-button>
</span>
- </el-dialog>
- <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%">
- <div v-if="dataDialogVisible" style="height: 74vh; overflow-y: auto">
- <div>
- <el-form :model="entity" :inline="true">
- <el-form-item label="妫�楠岄」" prop="outputWorkTime">
- <el-input v-model="entity.inspectionItem" clearable size="small"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="small" type="primary" @click="getLookList">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- </div>
- <lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading"
- :height="'60vh'" @pagination="lookPagination" key="tableData1" :key="upIndex"></lims-table>
- </div>
</el-dialog>
<el-dialog :visible.sync="bindDialogVisible" title="妫�楠岄」缁戝畾" width="600px">
<div slot="title" style="
@@ -241,7 +224,6 @@
bindingProductTreeByProductId,
delProductTreeByProductId,
selectInsOrderPlanList,
- selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { treeDevice } from "@/api/cnas/resourceDemand/device.js";
import { mapGetters } from "vuex";
@@ -291,7 +273,6 @@
],
active: 1,
tabIndex: 0,
- dataDialogVisible: false,
planTotal: 0,
insStateList: [],
state: 0, // 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅
@@ -320,7 +301,6 @@
retestInfo: [],
isCopper: null,
bindCurrentInfo: {},
- lookInfo: {},
orderTypeList: [
{
value: "Customer-ordered test",
@@ -466,88 +446,6 @@
type: "",
},
],
- // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---寮�濮�
- entity: {
- inspectionItem: "",
- },
- lookTableData: [],
- lookColumn: [
- {
- label: "鏍峰搧缂栧彿",
- prop: "sampleCode",
- width: "140px",
- mergeCol: true, //鍚堝苟鍒�
- },
- { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px", mergeCol: true },
- { label: "妫�楠岄」鍒嗙被", prop: "inspectionItemClass" },
- { label: "妫�楠岄」", prop: "inspectionItem", width: "140px" },
- { label: "妫�楠屽瓙椤�", prop: "inspectionItemSubclass" },
- { label: "鍗曚綅", prop: "unit" },
- { label: "鏍峰搧鍨嬪彿", prop: "model", mergeCol: true },
- { label: "鏉′欢", prop: "radius" },
- { label: "鐢电紗鏍囪瘑", prop: "cableTag" },
- { label: "璇曢獙瑕佹眰", prop: "tell" },
- { label: "妫�楠岀粨鏋�", prop: "lastValue" },
- {
- label: "缁撴灉鍒ゅ畾",
- prop: "insResult",
- dataType: "tag",
- formatData: (params) => {
- let obj = this.insResultList.find((m) => m.value == params)
- if (obj) {
- return this.insResultList.find((m) => m.value == params).label;
- } else {
- return null
- }
- },
- formatType: (params) => {
- let obj = this.insResultList.find((m) => m.value == params)
- if (obj) {
- return this.insResultList.find((m) => m.value == params).type;
- } else {
- return null
- }
- },
- },
- {
- dataType: "action",
- fixed: "right",
- label: "鎿嶄綔",
- operation: [
- {
- name: "涓嶅悎鏍煎娴嬫煡鐪�",
- type: "text",
- clickFun: (row) => {
- this.getRetestResultInfo(row);
- },
- disabled: (row) => {
- return row.insResult!=0
- },
- },
- {
- name: "妫�楠岄」缁戝畾",
- type: "text",
- clickFun: (row) => {
- this.getBinding(row);
- },
- disabled: (row) => {
- return (
- this.lookInfo.userName == null ||
- this.lookInfo.insState == 3 ||
- this.lookInfo.insState == 5
- );
- },
- },
- ],
- },
- ],
- lookPage: {
- total: 0,
- size: 20,
- current: 0,
- },
- lookTableLoading: false,
- // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
retestVisible: false,
upIndex: 0,
tabLabel: ''
@@ -600,29 +498,6 @@
this.page.size = limit;
this.getList();
},
- getLookList() {
- this.lookTableLoading = true;
- let param = { id: this.lookInfo.id, ...this.lookPage, inspectionItem: this.entity.inspectionItem };
- delete param.total;
- selectSampleAndProductByOrderId({ ...param })
- .then((res) => {
- this.lookTableLoading = false;
- if (res.code === 200) {
- this.lookTableData = res.data.records;
- this.lookPage.total = res.data.total;
- this.upIndex++
- this.dataDialogVisible = true;
- }
- })
- .catch((err) => {
- this.lookTableLoading = false;
- });
- },
- lookPagination({ page, limit }) {
- this.lookPage.current = page;
- this.lookPage.size = limit;
- this.getLookList();
- },
// 淇敼妫�楠屽��
editInspection(row) {
this.$refs.editInspectionItem.showDialog(row.id);
@@ -630,11 +505,6 @@
// 鏌ョ湅宸ユ椂
viewManHour(row) {
this.$refs.viewManHourDia.showDialog(row.id, row.insState);
- },
- // 鏁版嵁鏌ョ湅
- handleDataLook(row) {
- this.lookInfo = row;
- this.getLookList();
},
changeCheckBox(val) {
this.queryParams.userId = val ? 0 : null;
--
Gitblit v1.9.3