From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚
---
src/views/business/productOrder/index.vue | 101 +++++++-------------------------------------------
1 files changed, 15 insertions(+), 86 deletions(-)
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 1f24b24..5f5624f 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -55,7 +55,6 @@
<div>
<el-button v-if="tabIndex === 2 || tabIndex === 3 || tabIndex === 6" size="small"
@click="downLoad">瀵煎嚭</el-button>
- <el-button v-if="tabIndex === 1" size="small" type="primary" @click="openAddIns">娣诲姞妫�楠岄」</el-button>
<el-button size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button>
<el-button v-if="checkPermi(['add:insOrder'])" size="small" type="primary" @click="playOrder(1)">涓嬪崟</el-button>
</div>
@@ -294,8 +293,6 @@
<!--鏍囩鎵撳嵃寮规-->
<print-dialog v-if="printDialog" ref="printDialog" :printDialog="printDialog"
@closePrintDialog="closePrintDialog"></print-dialog>
- <!--娣诲姞閬楁紡妫�楠岄」寮规-->
- <add-inspection-dia v-if="addInspectionDia" ref="addInspectionDia"></add-inspection-dia>
<!--淇敼鏍峰搧鍨嬪彿寮规-->
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
:visible.sync="dialogVisible" title="淇敼鏍峰搧鍨嬪彿" width="80%">
@@ -325,7 +322,6 @@
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
import PrintDialog from "@/views/business/productOrder/components/printDialog.vue";
-import AddInspectionDia from "@/views/business/productOrder/components/addInspectionDia.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {
checkUpdate, delInsOrder, getSampleByOrderId,
@@ -344,7 +340,6 @@
name: 'ProductOrder',
components: {
limsTable,
- AddInspectionDia,
PrintDialog,
vueQr
},
@@ -367,75 +362,25 @@
linkMethod: "changeEntrustCode",
},
{ label: '濮旀墭鍗曚綅', prop: 'company' },
- {
- label: "鏍峰搧鍚嶇О",
- prop: "sampleName",
- width: "160px",
- dataType: "link",
- linkMethod: "selectAllByOne",
- },
- {
- label: "鏍峰搧鍨嬪彿",
- prop: "sampleModel",
- width: "160px",
- dataType: "link",
- linkMethod: "editSampleModel",
- },
- { label: '鏍峰搧鏁伴噺', prop: 'sampleNum' },
+ // {
+ // label: "鏍峰搧鍚嶇О",
+ // prop: "sampleName",
+ // width: "160px",
+ // dataType: "link",
+ // linkMethod: "selectAllByOne",
+ // },
+ // {
+ // label: "鏍峰搧鍨嬪彿",
+ // prop: "sampleModel",
+ // width: "160px",
+ // dataType: "link",
+ // linkMethod: "editSampleModel",
+ // },
+ { label: '鏍峰搧鏁伴噺', prop: 'testQuantity' },
{ label: '妫�楠屼汉', prop: 'testingName' },
- {
- dataType: 'tag',
- label: '绱ф�ョ▼搴�',
- prop: 'type',
- formatData: (params) => {
- if (params == 0) {
- return '鏅��'
- } else if (params == 1) {
- return '浼樺厛'
- } else {
- return '绱ф��'
- }
- },
- formatType: (params) => {
- if (params == 0) {
- return 'success'
- } else if (params == 1) {
- return 'warning'
- } else {
- return 'danger'
- }
- }
- },
{ label: '澶囨敞', prop: 'remark' },
{ label: '妫�楠岃繘搴�%', prop: 'insProgress' },
{ label: '绾﹀畾鏃堕棿', prop: 'appointed' },
- {
- dataType: 'tag',
- label: '妫�楠岀粨鏋�',
- prop: 'insResult',
- formatData: (params) => {
- if (params == 1) {
- return '鍚堟牸'
- } else if (params == 0) {
- return '涓嶅悎鏍�'
- } else if (params == 3) {
- return '涓嶅垽瀹�'
- } else {
- return null
- }
- },
- formatType: (params) => {
- if (params == 1) {
- return 'success'
- } else if (params == 0) {
- return 'danger'
- } else if (params == 3) {
- return ''
- } else {
- return null
- }
- }
- },
{ label: '涓嬪崟鏃堕棿', prop: 'createTime' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{ label: '閫�鍥炵悊鐢�', prop: 'tell' },
@@ -766,7 +711,6 @@
qrData: [],
multipleSelection: [],
printDialog: false,
- addInspectionDia: false,
dialogVisible: false,
submitListLoad: false,
sampleList: []
@@ -915,21 +859,6 @@
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
font_size: '0.20cm',
});
- },
- // 鎵撳紑娣诲姞妫�楠岄」寮规
- openAddIns() {
- if (this.multipleSelection.length === 0) {
- this.$message.warning('璇烽�夋嫨闇�瑕佹坊鍔犳楠岄」鐨勬暟鎹�')
- return
- }
- if (this.multipleSelection.length > 1) {
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- return
- }
- this.addInspectionDia = true
- this.$nextTick(() => {
- this.$refs.addInspectionDia.getDataList(this.multipleSelection[0])
- })
},
// 瀵煎嚭璁板綍
downLoad() {
--
Gitblit v1.9.3