@@ -265,6 +269,23 @@
+
+
+
+
+
@@ -289,6 +310,7 @@
updateBMBasicInformation,
searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM,
submitChange, issueChange, // 下达 // 提交
+ searchBMUser,
} from "@/api/sampleManagement/technicalSpecificationList.js"
import {
getNodeAuthority, // 获取节点权限
@@ -314,7 +336,9 @@
quotationOfficerFlag:false,
engineerFlag:false,
technicianFlag:false,
+ dccFlag:false,
operatorList:[],
+ dccList:[],
quotationOfficerList:[],
engineerList:[],
technicianList:[],
@@ -322,6 +346,7 @@
sp:'',
nodeName:'',
},
+
dataForm:{
nodeName:'',
process:'',
@@ -364,6 +389,8 @@
dccOperaterName:'',
engineerNo:'',
technicianNo:'',
+ dcc:'',
+ dccList:'',
},
dataRole: {
partTypeDesc: [
@@ -546,6 +573,14 @@
this.quotationNo = data.rows[0].quotationNo
}
})
+ let inData5 = {
+ site: this.dataForm.site,
+ codeNo: this.dataForm.codeNo,
+ type: 'dcc',
+ }
+ searchTechnicalSpecificationTeamStr(inData5).then(({data}) => {
+ this.dataForm.dccList = data.rows
+ })
} else {
this.dataList = '';
this.$alert('刷新失败请重新打开技术参数卡', '失败', {
@@ -597,6 +632,14 @@
this.quotationNo = data.rows[0].quotationNo
}
})
+ let inData5 = {
+ site: this.dataForm.site,
+ codeNo: this.dataForm.codeNo,
+ type: 'dcc',
+ }
+ searchTechnicalSpecificationTeamStr(inData5).then(({data}) => {
+ this.dataForm.dccList = data.rows
+ })
} else {
this.dataList = '';
}
@@ -643,7 +686,20 @@
this.engineerList = JSON.parse(JSON.stringify(this.dataForm.engineerList));
this.engineerFlag=true
},
-
+ dccChooseModal(){
+ if(this.ifDisableFlag){
+ return false
+ }
+ let inData={
+ site:this.dataForm.site,
+ buNo:this.dataForm.buNo,
+ }
+ searchBMUser(inData).then(({data}) => {
+ this.operatorList=data.rows
+ })
+ this.dccList = JSON.parse(JSON.stringify(this.dataForm.dccList));
+ this.dccFlag=true
+ },
saveEngineerList(){
let engineerName='';
for (let i = 0; i < this.engineerList.length; i++) {
@@ -682,6 +738,18 @@
this.dataForm.technicianList=JSON.parse(JSON.stringify(this.technicianList));
this.technicianFlag=false
},
+ savetDccList(){
+ let dccName='';
+ for (let i = 0; i < this.dccList.length; i++) {
+ let select= this.operatorList.filter(item => item.operatorId === this.dccList[i])
+ if(select.length>0){
+ dccName+=select[0].operatorName+';'
+ }
+ }
+ this.dataForm.dcc=dccName
+ this.dataForm.dccList=JSON.parse(JSON.stringify(this.dccList));
+ this.dccFlag=false
+ },
saveData(){
this.dataForm.engineerList = [];
this.dataForm.engineerList.push(this.dataForm.engineerNo);
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 7e865cf..569899d 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -427,7 +427,7 @@
width="600px"
title="功能清单"
:close-on-click-modal="false"
- :visible.sync="functionFlag">
+ :visible.sync ="functionFlag">
用户：
名称：
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 7ba6581..f168824 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -208,7 +208,7 @@
-
+
@@ -354,7 +354,7 @@
-
+
@@ -1382,6 +1382,7 @@
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 520;
+ this.fieldColumn()
})
},
methods: {
@@ -1845,7 +1846,7 @@
}
this.modelFlag=true
},
- changeSum() {
+ changeSum(row) {
if(row.standardCost<0||row.standardCost==null||row.standardCost==''){
row.standardCost=0
// this.$alert('成本不能为负数或者不填', '错误', {
@@ -2063,6 +2064,13 @@
}
})
},
+ fieldColumn(){
+ if(!this.accessField('10601001')){
+ this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost');
+ this.columnList1=this.columnList1.filter(item => item.columnProp !== 'totalCost');
+ }
+
+ },
},
activated() {
if (this.$route.params.type === 'tokenLogin') {
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue
index 07e1d1b..7a544c3 100644
--- a/src/views/modules/tooling/toolingInfo.vue
+++ b/src/views/modules/tooling/toolingInfo.vue
@@ -93,7 +93,7 @@
-
+
@@ -160,7 +160,7 @@
-
@@ -850,6 +850,13 @@
return s
},
+ fieldColumn(){
+ if(!this.accessField('10601001')){
+ this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost');
+
+ }
+
+ },
},
}