+
{
+ this.baseForm=data.row;
+ this.getNodeAuthority(data.row)
+ })
},
refreshBMPageModal(){
this.$confirm(`是否刷新至最新模板界面,已填数据会更新到新模板中,若旧属性在新模板中被删除,该条数据会消失。`, '提示', {
@@ -218,6 +233,86 @@
});
},
+ // 获取流程的配置权限
+ getNodeAuthority (row) {
+ //区分请求成功和失败的状况
+ let tempData = {
+ site: row.site,
+ stepId: row.stepId,
+ menuId: '103002'
+ }
+ getNodeAuthority(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
+ let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
+ if (arr.length > 0) {
+ if (arr[0].updateFlag === 'N') {
+ this.ifDisableFlag = true
+ } else {
+ this.ifDisableFlag = false
+ }
+ } else {
+ this.ifDisableFlag = true
+ }
+ }
+ })
+ },
+
+ // 同意提交
+ agreeSubmit () {
+ this.$confirm(`是否确认提交?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let tempData = {
+ site: this.searchData.site,
+ userName: this.$store.state.user.name,
+ codeNo: this.searchData.codeNo,
+ menuId: '103002',
+ nodeConclusion: 'Y'
+ }
+ this.submitData(tempData)
+ })
+ },
+
+ // 驳回提交
+ rejectSubmit () {
+ this.$confirm(`是否确认驳回?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let tempData = {
+ site: this.searchData.site,
+ userName: this.$store.state.user.name,
+ codeNo: this.searchData.codeNo,
+ menuId: '103002',
+ nodeConclusion: 'N'
+ }
+ this.submitData(tempData)
+ })
+ },
+ submitData (tempData) {
+
+ saveBMPropertiesValue(this.tableData).then(({data}) => {
+ if (data && data.code === 0) {
+ submitChange(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message({message: '操作成功', type: 'success'})
+ this.$emit("closeModel")
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
index 3fe36ff..73f3de3 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
@@ -35,6 +35,7 @@
codeNo: '',
buNo:'',
type:'',
+ fieldId:'',
},
ifDisableFlag:false,
picUrl:this.$store.state.user.bmPicUrl+'defaultPaperOrientation.png',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 5ef3e4a..f0529d0 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -13,7 +13,9 @@
- 保存
+ 保存
+ 同意
+ 驳回
@@ -173,8 +175,8 @@
刷新
- 变更
- 调整至Routing
+ 变更
+ 跳转至Routing
@@ -441,7 +443,11 @@
updateBMRouteRev,
tsdBasicInformationSearch,
updateBMProcess,
+ submitChange, // 提交
} from "@/api/sampleManagement/technicalSpecificationList.js"
+ import {
+ getNodeAuthority, // 获取节点权限
+ } from '@/api/changeManagement/changeManagement.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
searchOperatorWithSite,
@@ -507,6 +513,11 @@
username: this.$store.state.user.name,
codeNo: '',
buNo:'',
+ fieldId:'',
+ },
+ baseForm:{
+ status:'',
+ isReject:'',
},
tableData:'',
partList:[],
@@ -865,6 +876,9 @@
methods: {
// 获取基础数据列表S
getBaseList (val, type) {
+ if(this.ifDisableFlag){
+ return false
+ }
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
@@ -911,6 +925,8 @@
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data&& data.code===0){
this.sheetData=data.row
+ this.baseForm=data.row;
+ this.getNodeAuthority(data.row)
}else {
this.$message.error(data.msg)
}
@@ -1139,6 +1155,7 @@
},
savepeEngineerList(){
+
let peEngineerName='';
for (let i = 0; i < this.peEngineerList.length; i++) {
let select= this.operatorList.filter(item => item.operatorId === this.peEngineerList[i])
@@ -1396,7 +1413,101 @@
window.open('#/part-routingManagement');
},
+ // 获取流程的配置权限
+ getNodeAuthority (row) {
+ //区分请求成功和失败的状况
+ let tempData = {
+ site: row.site,
+ stepId: row.stepId,
+ menuId: '103002'
+ }
+ getNodeAuthority(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
+ let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId)
+ if (arr.length > 0) {
+ if (arr[0].updateFlag === 'N') {
+ this.ifDisableFlag = true
+ } else {
+ this.ifDisableFlag = false
+ }
+ } else {
+ this.ifDisableFlag = true
+ }
+ }
+ })
+ },
+
+ // 同意提交
+ agreeSubmit () {
+ this.$confirm(`是否确认提交?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let tempData = {
+ site: this.searchData.site,
+ userName: this.$store.state.user.name,
+ codeNo: this.searchData.codeNo,
+ menuId: '103002',
+ nodeConclusion: 'Y'
+ }
+ this.submitData(tempData)
+ })
+ },
+
+ // 驳回提交
+ rejectSubmit () {
+ this.$confirm(`是否确认驳回?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ let tempData = {
+ site: this.searchData.site,
+ userName: this.$store.state.user.name,
+ codeNo: this.searchData.codeNo,
+ menuId: '103002',
+ nodeConclusion: 'N'
+ }
+ this.submitData(tempData)
+ })
+ },
+ async submitData (tempData) {
+ await updateBMProcess(this.sheetData).then(({data}) => {
+ if (data && data.code === 0) {
+ tsdBasicInformationSearch(this.searchData).then(({data}) => {
+ if(data.row){
+ this.sheetData=data.row
+ }else {
+
+ }
+
+ });
+ } else {
+ this.$message.error(data.msg)
+ return false
+ }
+ })
+ await updateBMRoutingDetail(this.dataForm).then(({data}) => {
+ if (data && data.code === 0) {
+ } else {
+ this.$message.error(data.msg)
+ return false
+ }
+ })
+ await submitChange(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message({message: '操作成功', type: 'success'})
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index c7b038a..7cc28c5 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -610,7 +610,6 @@
stepId: row.stepId,
menuId: '103002'
}
- debugger
getNodeAuthority(tempData).then(({data}) => {
if (data && data.code === 0) {
let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
@@ -670,8 +669,6 @@
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.$message({message: '操作成功', type: 'success'})
- this.submitModalFlag = false
- this.modalFlag = false
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 4daa2f7..017fa62 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -119,10 +119,10 @@
username:this.$store.state.user.name,
type:'',
ifDisableFlag:false,
+ fieldId:'',
},
pageRole:'',
activeName:'baseInfo',
-
}
},
mounted() {
@@ -141,6 +141,7 @@
},
methods: {
refreshCurrentTabTable(){
+ this.dataForm.fieldId=this.activeName
//先调整页面的高度
this.changeHeightAuto()
if (this.activeName == 'baseInfo') {