From 1b7ff2f053d04a5332aadf59820b567cae1df8d4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 25 三月 2025 10:14:40 +0800
Subject: [PATCH] 原辅料下单1.报检类型增加2.检验项匹配
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 3fbef5c..ff4930d 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -155,13 +155,13 @@
{ label: '璇曢獙瀹�', prop: 'sonLaboratory' },
{ label: '瑕佹眰鎻忚堪', prop: 'askTell' },
{ label: '瑕佹眰鍊�', prop: 'ask' },
+ { label: '璇曢獙鏉′欢', prop: 'radiusList' },
{ label: '璁￠噺鍗曚綅', prop: 'unit' },
{ label: '宸ユ椂(H)', prop: 'manHour' },
{ label: '棰勮鏃堕棿(H)', prop: 'manDay' },
{ label: '宸ユ椂鍒嗙粍', prop: 'manHourGroup' },
{ label: '鍒涘缓鏃堕棿', prop: 'createTime' },
{ label: '淇敼鏃堕棿', prop: 'updateTime' },
- { label: '鏉′欢', prop: 'radiusList' },
{
dataType: 'action',
fixed: 'right',
@@ -283,16 +283,16 @@
this.bindPartFirst(row);
},
},
- {
- name: '杞﹂棿缁戝畾',
- type: 'text',
- clickFun: (row) => {
- this.bindWokshop1(row);
- },
- disabled: (row) => {
- return row.objectType != '鍘熸潗鏂�'
- }
- },
+ // {
+ // name: '杞﹂棿缁戝畾',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.bindWokshop1(row);
+ // },
+ // disabled: (row) => {
+ // return row.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗'
+ // }
+ // },
]
}
],
@@ -315,7 +315,7 @@
productColumn: [
{ label: '浜у搧鍚嶇О', prop: 'name' },
{ label: '浜у搧鍚嶇ОEN', prop: 'nameEn' },
- { label: '杞﹂棿鍚嶇О', prop: 'workShopName' },
+ // { label: '杞﹂棿鍚嶇О', prop: 'workShopName' },
{
dataType: 'action',
label: '鎿嶄綔',
@@ -341,20 +341,20 @@
this.bindPartSecond(row);
},
},
- {
- name: '杞﹂棿缁戝畾',
- type: 'text',
- clickFun: (row) => {
- this.bindWokshop(row);
- },
- showHide: (row) => {
- if (this.currentObj.objectType != '鍘熸潗鏂�') {
- return false
- } else {
- return true
- }
- }
- },
+ // {
+ // name: '杞﹂棿缁戝畾',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.bindWokshop(row);
+ // },
+ // showHide: (row) => {
+ // if (this.currentObj.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗') {
+ // return false
+ // } else {
+ // return true
+ // }
+ // }
+ // },
// {
// name: '鍘傚瀵嗗害缁戝畾',
// type: 'text',
@@ -413,7 +413,7 @@
this.getDicts("product_classification").then((response) => {
this.productClassification = this.dictToValue(response.data);
});
- this.selectWorkShop()
+ // this.selectWorkShop()
},
computed: {
title() {
@@ -514,6 +514,11 @@
}
},
refresh() {
+ this.itemParameterForm = {
+ inspectionItem: null,
+ inspectionItemSubclass: null,
+ sample: null
+ }
this.resetForm('itemParameterForm')
this.page.current = 1
this.refreshTable()
@@ -581,15 +586,15 @@
// 浜у搧缁存姢
upProduct(row) {
this.currentObj = row;
- if (this.currentObj.objectType == '鍘熸潗鏂�') {
- if (this.productColumn.length < 4) {
- this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
- }
- } else {
- if (this.productColumn.length == 4) {
- this.productColumn.splice(2, 1)
- }
- }
+ // if (this.currentObj.objectType == '鍘熻緟鏂�') {
+ // if (this.productColumn.length < 4) {
+ // this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
+ // }
+ // } else {
+ // if (this.productColumn.length == 4) {
+ // this.productColumn.splice(2, 1)
+ // }
+ // }
this.diaProduct = true
this.objectId = row.id
this.productPage.current = 1
--
Gitblit v1.9.3