diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index 8666c32..8bac03d 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -100,6 +100,11 @@ } +.bigButton { + width:60px;height: 25px;font-size: 14px; +} + + diff --git a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue index b28ccda..d8cf1bc 100644 --- a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue +++ b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue @@ -120,6 +120,59 @@ status: true, fixed: '', columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table9NodeId', + tableId: "101002001Table9", + tableName: "技术参数卡列表", + columnProp: "nodeId", + headerAlign: "center", + align: "left", + columnLabel: "当前节点", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table9NodeName', + tableId: "101002001Table9", + tableName: "技术参数卡列表", + columnProp: "nodeName", + headerAlign: "center", + align: "left", + columnLabel: "节点名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 + },{ + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table9SP', + tableId: "101002001Table9", + tableName: "技术参数卡列表", + columnProp: "sp", + headerAlign: "center", + align: "left", + columnLabel: "当前审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 101002001, diff --git a/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue b/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue index 538113a..747b7af 100644 --- a/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue +++ b/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue @@ -210,6 +210,59 @@ fixed: '', columnWidth: 200 }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table10NodeId', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "nodeId", + headerAlign: "center", + align: "left", + columnLabel: "当前节点", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table10NodeName', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "nodeName", + headerAlign: "center", + align: "left", + columnLabel: "节点名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 + },{ + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table10SP', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "sp", + headerAlign: "center", + align: "left", + columnLabel: "当前审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, { userId: this.$store.state.user.name, functionId: 101002001, diff --git a/src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue b/src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue index cfa0759..1c154f6 100644 --- a/src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue +++ b/src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue @@ -183,6 +183,59 @@ status: true, fixed: '', columnWidth: 50 + }, + { + userId: this.$store.state.user.name, + functionId: 101002002, + serialNumber: '101002002Table9NodeId', + tableId: "101002002Table9", + tableName: "技术参数卡列表", + columnProp: "nodeId", + headerAlign: "center", + align: "left", + columnLabel: "当前节点", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70 + }, + { + userId: this.$store.state.user.name, + functionId: 101002002, + serialNumber: '101002002Table9NodeName', + tableId: "101002002Table9", + tableName: "技术参数卡列表", + columnProp: "nodeName", + headerAlign: "center", + align: "left", + columnLabel: "节点名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 + },{ + userId: this.$store.state.user.name, + functionId: 101002002, + serialNumber: '101002002Table9SP', + tableId: "101002002Table9", + tableName: "技术参数卡列表", + columnProp: "sp", + headerAlign: "center", + align: "left", + columnLabel: "当前审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 101002002, diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index 38f797c..8a914e0 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -33,6 +33,9 @@ + + + @@ -156,7 +159,7 @@ @@ -225,6 +228,13 @@ min-width="120" label="物料名称"> + + +
+ + + +
+
+ + + +
@@ -36,16 +46,6 @@
- - - - - - - - - -
@@ -241,8 +241,8 @@ codeNo:'', finalCustomerNo:'', finalCustomerDesc:'', - directCustomerNo:'', - directCustomerDesc:'', + customerId:'', + customerDesc:'', partNo:'', partDesc:'', customerRevNo:'', diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 826cf34..a63cef6 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -8,6 +8,7 @@ 保存 同意 驳回 + 下达
@@ -287,7 +288,7 @@ searchTechnicalSpecificationTeamStr, updateBMBasicInformation, searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM, - submitChange, // 提交 + submitChange, issueChange, // 下达 // 提交 } from "@/api/sampleManagement/technicalSpecificationList.js" import { getNodeAuthority, // 获取节点权限 @@ -780,7 +781,31 @@ this.submitData(tempData) }) }, - +// 下达 + issueModal (row) { + this.$confirm(`是否确认下达?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let tempData = { + site: this.searchData.site, + userName: this.searchData.username, + codeNo: this.searchData.codeNo, + menuId: '103002' + } + issueChange(tempData).then(({data}) => { + if (data && data.code === 0) { + this.search() + this.$message({message: '操作成功', type: 'success'}) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }) + }, // 打开提交模态框 submitDataModal () { diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 107939d..29da6d0 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -463,10 +463,10 @@ }, { userId: this.$store.state.user.name, - functionId: 106002, - serialNumber: '106002Table1NodeId', - tableId: "106002Table1", - tableName: "刀具申请主表", + functionId: 103002, + serialNumber: '103002Table1NodeId', + tableId: "103002Table1", + tableName: "技术参数卡列表", columnProp: "nodeId", headerAlign: "center", align: "left", @@ -481,10 +481,10 @@ }, { userId: this.$store.state.user.name, - functionId: 106002, - serialNumber: '106002Table1NodeName', - tableId: "106002Table1", - tableName: "刀具申请主表", + functionId: 103002, + serialNumber: '103002Table1NodeName', + tableId: "103002Table1", + tableName: "技术参数卡列表", columnProp: "nodeName", headerAlign: "center", align: "left", @@ -496,6 +496,23 @@ status: true, fixed: '', columnWidth: 150 + },{ + userId: this.$store.state.user.name, + functionId: 103002, + serialNumber: '103002Table1SP', + tableId: "103002Table1", + tableName: "技术参数卡列表", + columnProp: "sp", + headerAlign: "center", + align: "left", + columnLabel: "当前审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 },{ userId: this.$store.state.user.name, functionId: 103002, @@ -614,7 +631,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 50 + columnWidth: 65 },{ userId: this.$store.state.user.name, functionId: 103002, diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index e6526e4..4048a3e 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -480,9 +480,9 @@ - {{'取消'}} - 同意 - 驳回 + {{'取消'}} + 同意 + 驳回