diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index c764802..005439c 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -617,55 +617,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -677,15 +628,15 @@ - + - - - + + + @@ -698,15 +649,15 @@ - + - - - + + + @@ -727,15 +678,15 @@ - + - - - + + + @@ -751,6 +702,55 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue index a1ea8fb..dc739bb 100644 --- a/src/views/modules/processManagement/processBindingInfo.vue +++ b/src/views/modules/processManagement/processBindingInfo.vue @@ -1201,7 +1201,10 @@ this.queryTableParam = { tableType: 'plm_project_tool_applyHeader', passTable: [], - addTable: [] + addTable: [ + 'plm_project_tool_applyHeader', + 'plm_project_tool_applyDetail' + ] } } else { return diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 8854b4c..fd2edef 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -634,7 +634,7 @@ tableId: "101002001Table1", tableName: "项目信息主表", columnProp: "buNo", - headerAlign: "center", + headerAlign: 'center', align: "left", columnLabel: "BU编码", columnHidden: false, 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 beedfa0..ee08115 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -14,12 +14,12 @@ 保存后跳转至详情 - 项目料号 + 项目料号 - + @@ -436,6 +436,9 @@ let strVal = '' if (val === 134) { if(type==1) { + if(this.dataForm.id!=0){ + return false + } strVal = this.dataForm.testPartNo } } @@ -525,6 +528,7 @@ page: 1, limit: 10, id:id, + userName:this.$store.state.user.name, site:this.$store.state.user.site, } technicalSpecificationListSearch(inData).then(({data}) => { @@ -554,6 +558,12 @@ searchTechnicalSpecificationTeamStr(inData3).then(({data}) => { this.dataForm.engineerList=data.rows }) + this.visible = true + }else { + this.$alert('技术参数卡数据有误！', '错误', { + confirmButtonText: '确定' + }) + } }) }else { @@ -589,9 +599,8 @@ mpOperator:'', oriCodeNo:'', } - + this.visible = true } - this.visible = true }, chooseProofingModel(){ if(this.dataForm.id!=0){ diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 2142db4..e4315ad 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -107,36 +107,63 @@ -
+
-
+
-
+
-
- - +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ + +
+ +
-
- - +
+ + + +
+
+ +
-
- - +
+ +
@@ -177,28 +204,6 @@
- -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
@@ -281,6 +286,10 @@ + + + + @@ -325,14 +334,21 @@ import Chooselist from '@/views/modules/common/Chooselist' import AddOrUpdate from './com_technical-add-or-update' import BuSelect from "../base/BuSelect.vue"; + import { + getNodeAuthority, // 获取节点权限 + getApprovalList, // 查询审批信息 + } from '@/api/changeManagement/changeManagement.js' + import ApprovalInformation from "../changeManagement/approvalInformation.vue"; export default { components: { + ApprovalInformation, Chooselist, AddOrUpdate, BuSelect, }, data() { return { + approvalList:[], activeName:'info', addOrUpdateVisible:false, height:200, @@ -821,6 +837,9 @@ if (this.activeName == 'customerInfo') { this.getTechnicalCustomerInfoData(); } + if (this.activeName === 'approvalInformation') { + this.getApprovalList() + } }, getTechnicalCustomerInfoData(){ let inData={ @@ -943,6 +962,22 @@ return s }, + getApprovalList () { + if (Object.keys(this.currentRow).length !== 0) { + let tempData = { + site: this.$store.state.user.site, + menuId: this.$route.meta.menuId, + documentNo: this.currentRow.applyNo + } + getApprovalList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.approvalList = data.rows + } else { + this.approvalList = [] + } + }) + } + }, }, } diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 81f295d..0b17099 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -58,6 +58,7 @@ label="操作"> @@ -138,6 +139,10 @@ + + + + @@ -183,10 +188,6 @@ - - - - @@ -232,6 +233,96 @@ + + + + + + + + + + + + + + + + + + + + 报价员 + + + + TP + + + + 采购员 + + + + + + + + + + + + + +
+ + + + + +
+ + {{'保存'}} + {{'取消'}} + +
- {{'保存'}} + {{'取消'}} 同意 驳回 @@ -447,6 +538,7 @@ endDate:'', }, toolData:[], + visibleU:false, dataForm:{ site: '', applyNo: '', @@ -1310,6 +1402,39 @@ }) this.visible=true }, + editModalU (row) { + this.getNodeAuthority(row) + this.dataForm = { + site: row.site, + applyNo: row.applyNo, + applyBy: row.applyBy, + applyDate: row.applyDate, + applySumQty: row.applySumQty, + applyReason: row.applyReason, + remark: row.remark, + createBy: row.createBy, + department:row.department, + detailList: [], + status: row.status, + rejectOpinion: '', + nodeConclusion: '', + quoter: row.quoter, + quoterName: row.quoterName, + tp: row.tp, + tpName: row.tpName, + purchaser: row.purchaser, + purchaserName: row.purchaserName, + menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, + } + searchProjectToolApplyDetail({ site: row.site, + applyNo: row.applyNo,}).then(({data}) => { + if (data.code == 0) { + this.toolData = data.rows + } + }) + this.visibleU=true + }, comfirmApply (row) { this.$confirm(`确定下达这个申请`, '提示', { confirmButtonText: '确定', @@ -1571,6 +1696,7 @@ } } this.visible = false + this.visibleU = false this.refreshCurrentTabTable() this.$message({ message: '操作成功',