diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index e160026..c4acb46 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -137,5 +137,7 @@ export const bmStatusToCg = data => createAPI("/technicalSpecification/bmStatusT
export const bmStatusToFinish = data => createAPI("/technicalSpecification/bmStatusToFinish",'post',data)
+export const getNodeList = data => createAPI("/technicalSpecification/node/list",'post',data)
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 52f38f4..1e96887 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -18,6 +18,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -52,6 +72,7 @@
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
+
@@ -355,6 +376,21 @@
+
+
+
@@ -475,6 +511,7 @@
+
@@ -490,6 +527,7 @@
bmStatusToDead, // Dead
bmStatusToCg, // Re-Sample
bmStatusToFinish, // 归档
+ getNodeList
} from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist'
import AddOrUpdate from './com_technical-add-or-update'
@@ -501,8 +539,12 @@
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
import ChangeLog from "./technicalSpecificationDetail/changeLog.vue";
+ import FilterSearch from "../../common/filterSearch.vue";
+ import OssComponents from "../oss/ossComponents.vue";
export default {
components: {
+ OssComponents,
+ FilterSearch,
ChangeLog,
CustomerInfo,
ApprovalInformation,
@@ -513,8 +555,10 @@
data() {
return {
approvalList: [],
+ fileContentList: [],
activeName: 'info',
addOrUpdateVisible: false,
+ filterVisible: false,
height: 200,
dataList1: [],
partList: [],
@@ -543,7 +587,11 @@
ecnFlag: '',
buNo: '',
customerDesc: '',
+ sp: '',
+ nodeId: '',
+ documentSource: '',
},
+ nodeOptions: [],
pageIndex: 1,
pageSize: 20,
totalPage: 0,
@@ -918,6 +966,80 @@
columnWidth: 200
},
],
+ fileColumnList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileName',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileName',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '文件名称',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileRemark',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileRemark',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '备注',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 240
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreateDate',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传时间',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreatedBy',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createBy',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ }
+ ],
infoData:{
testPartNo:'',
partTypeDesc:'',
@@ -975,6 +1097,7 @@
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 520;
+ this.fetchNodeOptions()
})
},
activated() {
@@ -1415,6 +1538,21 @@
})
},
+ fetchNodeOptions() {
+ getNodeList(this.searchData).then(({ data }) => {
+ if (data && data.code === 0) {
+ this.nodeOptions = data.rows.map(item => ({
+ id: item.nodeId,
+ name: item.nodeName
+ }));
+ } else {
+ this.$message.error('获取节点列表失败');
+ }
+ }).catch(error => {
+ this.$message.error('请求失败:' + error);
+ });
+ }
+
},
}