@@ -163,9 +166,6 @@
-
- 保存
-
{
@@ -370,7 +377,6 @@
}
//刷新表格
this.searchTable();
-
},
refresh(){
if(this.searchData.codeNo===''||this.searchData.codeNo===null){
@@ -382,7 +388,11 @@
tsdBasicInformationSearch(this.searchData).then(({data}) => {
//区分请求成功和失败的状况
if (data && data.code == 0) {
+ this.getNodeAuthority(data.row)
this.dataForm = data.row
+ console.log(!this.ifDisableFlag)
+ console.log(this.dataForm.status === 'spz')
+ console.log(this.dataForm.status === 'spz'&&!this.ifDisableFlag)
this.$alert('刷新成功', '成功', {
confirmButtonText: '确定'
})
@@ -432,6 +442,7 @@
//区分请求成功和失败的状况
if (data && data.code == 0) {
this.dataForm = data.row
+ this.getNodeAuthority(data.row)
let inData = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
@@ -591,7 +602,88 @@
window.open('#/quotation-sellForQuotation');
}
- }
+ },
+ // 获取流程的配置权限
+ getNodeAuthority (row) {
+ let tempData = {
+ site: row.site,
+ stepId: row.stepId,
+ menuId: '103002'
+ }
+ debugger
+ getNodeAuthority(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
+ let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
+ 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) {
+
+ updateBMBasicInformation(this.dataForm).then(({data}) => {
+ if (data && data.code === 0) {
+ 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: '确定'
+ })
+ }
+ })
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index e85c7a2..4daa2f7 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -2,7 +2,7 @@
-
+
@@ -118,6 +118,7 @@
buNo:'',
username:this.$store.state.user.name,
type:'',
+ ifDisableFlag:false,
},
pageRole:'',
activeName:'baseInfo',
diff --git a/src/views/modules/sys/dict-data-select.vue b/src/views/modules/sys/dict-data-select.vue
index 09a8825..f099f48 100644
--- a/src/views/modules/sys/dict-data-select.vue
+++ b/src/views/modules/sys/dict-data-select.vue
@@ -40,6 +40,10 @@ export default {
disabledOptionsValue:{
type:Array,
default:()=>[],
+ },
+ site:{
+ type:String,
+ default:undefined,
}
},
data () {
@@ -68,6 +72,10 @@ export default {
dictType:this.dictType,
dictTypeList: this.dictTypeList
}
+ if (this.site){
+ params.site = this.site
+ }
+
try {
// 等待返回值
let {data} = await selectDictDataList(params);