@@ -254,10 +257,19 @@
this.searchTable();
},
- searchTable(){
+ refresh(){
+ if(this.searchData.codeNo===''||this.searchData.codeNo===null){
+ this.$alert('刷新失败请重新打开技术参数卡', '失败', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
searchBMcustomerInfo(this.searchData).then(({data}) => {
if(data.rows.length>0){
this.dataForm = data.rows[0];
+ this.$alert('刷新成功', '成功', {
+ confirmButtonText: '确定'
+ })
}else {
this.dataForm.site=this.searchData.site
this.dataForm.codeNo=this.searchData.codeNo
@@ -266,6 +278,16 @@
});
},
+ searchTable(){
+ searchBMcustomerInfo(this.searchData).then(({data}) => {
+ if(data.rows.length>0){
+ this.dataForm = data.rows[0];
+ }else {
+ this.dataForm.site=this.searchData.site
+ this.dataForm.codeNo=this.searchData.codeNo
+ }
+ });
+ },
saveData(){
this.$confirm("是否保存信息?", '保存提示', {
confirmButtonText: '确定',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index b685f21..bce10e0 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -2,7 +2,15 @@
-
+
+
+
+ 热转移打印人员
+
+
+
+ 印刷人员
+
保存
@@ -499,7 +507,15 @@
tableData:'',
partList:[],
ifDisableFlag:false,
- process:"",
+ sheetData:{
+ site: '',
+ codeNo: '',
+ process:'',
+ overPrintOperator:'',
+ overPrintOperatorName:'',
+ printOperator:'',
+ printOperatorName:'',
+ },
dataForm:{
site: '',
codeNo:'',
@@ -832,7 +848,9 @@
//变更工艺路线
modalFlag:false,
routeDetailList:[],
- currentRoute:null
+ currentRoute:null,
+ tagNo:'',
+ tagNo1:'',
}
},
mounted () {
@@ -847,9 +865,12 @@
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
- if (val === 1013) {
+ if (val === 103) {
if(type==1) {
- strVal = this.dataForm.partType
+ strVal = this.sheetData.overPrintOperator
+ }
+ if(type==2) {
+ strVal = this.sheetData.printOperator
}
}
this.$refs.baseList.init(val, strVal)
@@ -857,10 +878,14 @@
},
/* 列表方法的回调 */
getBaseData (val) {
- if (this.tagNo === 1013) {
+ if (this.tagNo === 103) {
if(this.tagNo1==1) {
- this.dataForm.partType = val.Base_id
- this.dataForm.partTypeDesc = val.Base_desc
+ this.sheetData.overPrintOperator = val.username
+ this.sheetData.overPrintOperatorName = val.user_display
+ }
+ if(this.tagNo1==2) {
+ this.sheetData.printOperator = val.username
+ this.sheetData.printOperatorName = val.user_display
}
}
},
@@ -881,7 +906,7 @@
searchTable(){
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
- this.process=data.row.process
+ this.sheetData=data.row
}else {
}
@@ -1297,16 +1322,11 @@
this.currentRoute=row
},
updateBMProcess(){
- let inData={
- site:this.searchData.site,
- codeNo:this.searchData.codeNo,
- process:this.process
- }
- updateBMProcess(inData).then(({data}) => {
+ updateBMProcess(this.sheetData).then(({data}) => {
if (data && data.code === 0) {
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
- this.process=data.row.process
+ this.sheetData=data.row
}else {
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index fa98398..099a620 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -1,5 +1,8 @@
+
+ 刷新数据
+
@@ -132,14 +135,14 @@
resize='none'
maxlength="200"
:disabled="ifDisableFlag"
- style="height: 500px" >
+ style="height: 200px" >
-
+
保存
{
+ //区分请求成功和失败的状况
+ if (data && data.code == 0) {
+ this.dataForm = data.row
+ this.$alert('刷新成功', '成功', {
+ confirmButtonText: '确定'
+ })
+ let inData = {
+ site: this.dataForm.site,
+ codeNo: this.dataForm.codeNo,
+ type: 'quotationOfficer',
+ }
+ searchTechnicalSpecificationTeamStr(inData).then(({data}) => {
+ this.dataForm.quotationOfficerList = data.rows
+ })
+ let inData2 = {
+ site: this.dataForm.site,
+ codeNo: this.dataForm.codeNo,
+ type: 'technician',
+ }
+ searchTechnicalSpecificationTeamStr(inData2).then(({data}) => {
+ this.dataForm.technicianList = data.rows
+ })
+ let inData3 = {
+ site: this.dataForm.site,
+ codeNo: this.dataForm.codeNo,
+ type: 'engineer',
+ }
+ searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
+ this.dataForm.engineerList = data.rows
+ })
+ let inData4={
+ site:data.row.site,
+ productNo:data.row.finalPartNo,
+ }
+ searchPartLastQuotationNo(inData4).then(({data}) => {
+ if(data.rows.length>0){
+ this.quotationNo = data.rows[0].quotationNo
+ }
+ })
+ } else {
+ this.dataList = '';
+ this.$alert('刷新失败请重新打开技术参数卡', '失败', {
+ confirmButtonText: '确定'
+ })
+ }
+ });
+ },
searchTable(){
tsdBasicInformationSearch(this.searchData).then(({data}) => {
//区分请求成功和失败的状况