diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 01f4214..544f2c5 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -98,3 +98,4 @@ export const searchBMRemarkPage= data => createAPI(`/technicalSpecification/sear
export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/updateBMRemarkPage`,'post',data)
export const updateBMProcess= data => createAPI(`/technicalSpecification/updateBMProcess`,'post',data)
+export const searchPartLastQuotationNo= data => createAPI(`/technicalSpecification/searchPartLastQuotationNo`,'post',data)
diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index f5d50ac..5ebd2df 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -68,12 +68,12 @@
}
.superInput {
- border-bottom: 1px solid #00fff7; /* 下划线样式 */
+ border-bottom: 1px solid rgb(23, 179, 163); /* 下划线样式 */
font-weight: bold; /* 加粗文字 */
- color: #00fff7; /* 文字颜色 */
+ color: rgb(23, 179, 163); /* 文字颜色 */
}
.blue-input .el-input__inner {
font-weight: bold;
- color: dodgerblue;
+ color: rgb(23, 179, 163);
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 23c20da..a2fadce 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,8 @@ export default {
multiLanguage: '',
authControl: '',
userSite: 0,
- bmPicUrl:'http://172.19.1.142:80/upload/',
- // bmPicUrl:'http://192.168.1.83:81/upload/',
+ // bmPicUrl:'http://172.19.1.142:80/upload/',
+ bmPicUrl:'http://192.168.1.83:81/upload/',
},
mutations: {
updateId (state, id) {
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index e415051..3648fa1 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -8,6 +8,12 @@
+
+
+
+
+
+
查询
新增
@@ -881,6 +887,8 @@ export default {
site: this.$store.state.user.site,
partNo: '',
partDesc: '',
+ bomType:'',
+ engChgLevel:'',
page: 1,
limit: 10
},
@@ -2467,6 +2475,14 @@ export default {
* 获取数据列表
*/
getDataList () {
+ //如果是跳转过来的 要判断
+ if(localStorage.getItem('bomData')!=undefined){
+ let data=JSON.parse(localStorage.getItem('bomData'));
+ this.searchData.partNo=data.partNo
+ this.searchData.bomType=data.bomType
+ this.searchData.engChgLevel=data.engChgLevel
+ }
+
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.queryLoading = true
@@ -2477,9 +2493,21 @@ export default {
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
+
+ if(localStorage.getItem('bomData')!=undefined){
+
+ this.updateModal(this.dataList[0])
+
+ }
}
this.queryLoading = false
+ if(localStorage.getItem('bomData')!=undefined){
+ this.$nextTick(function () {
+ localStorage.removeItem('bomData');
+ })
+ }
})
+
},
/**
* 复选列表信息
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index cae748e..d24f8cf 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -8,6 +8,12 @@
+
+
+
+
+
+
查询
新增
@@ -907,6 +913,8 @@ export default {
site: this.$store.state.user.site,
partNo: '',
partDesc: '',
+ routingType:'',
+ routingRevision:'',
page: 1,
limit: 10
},
@@ -2341,6 +2349,13 @@ export default {
* 获取数据列表
*/
getDataList () {
+ //如果是跳转过来的 要判断
+ if(localStorage.getItem('routeData')!=undefined){
+ let data=JSON.parse(localStorage.getItem('routeData'));
+ this.searchData.partNo=data.partNo
+ this.searchData.routingType=data.routingType
+ this.searchData.routingRevision=data.routingRevision
+ }
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.queryLoading = true
@@ -2351,9 +2366,20 @@ export default {
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
+ if(localStorage.getItem('routeData')!=undefined){
+
+ this.updateModal(this.dataList[0])
+
+ }
}
this.queryLoading = false
+ if(localStorage.getItem('routeData')!=undefined){
+ this.$nextTick(function () {
+ localStorage.removeItem('routeData');
+ })
+ }
})
+
},
/**
* 复选列表信息
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 60616da..e069123 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -740,6 +740,12 @@ export default {
},
// 初始化数据
initData() {
+ //如果是跳转过来的
+ if(localStorage.getItem('quotationData')!=undefined){
+ let data=JSON.parse(localStorage.getItem('quotationData'));
+ this.searchData.quotationNo=data.quotationNo
+ localStorage.removeItem('quotationData');
+ }
let ids = ""
if (this.$route.params.ids) {
ids = "?"
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index 6b78108..d491c72 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -16,6 +16,7 @@
刷新
变更
+ 跳转至BOM
@@ -441,7 +442,7 @@
})
return false;
}
- if(this.currentRow.status!='Buildable'){
+ if(this.currentRow.status!=='Buildable'){
this.$alert('只有Buildable状态的可以保存！', '错误', {
confirmButtonText: '确定'
})
@@ -464,6 +465,16 @@
}
})
},
+ jumpBom(){
+ let inData={
+ site:this.searchData.site,
+ partNo:this.bomData.partNo,
+ bomType:this.bomData.bomType,
+ engChgLevel:this.bomData.engChgLevel,
+ }
+ localStorage.setItem('bomData', JSON.stringify(inData))
+ window.open('#/part-bomManagement');
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 9568910..3329072 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -54,7 +54,10 @@
-
+
+
+
+
@@ -176,6 +179,7 @@
},
ifDisableFlag:false,
dataForm:{
+ materialType:'',
site: '',
codeNo:'',
finalCustomerNo:'',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 95fcf32..74cc62b 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -166,6 +166,7 @@
刷新
变更
+ 调整至Route
@@ -1282,13 +1283,14 @@
})
},
updateBMRouteRev(){
+
if(this.currentRoute==null){
this.$alert('请点击选择Route版本！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.currentRow.status!='Buildable'){
+ if(this.currentRoute.status!=='Buildable'){
this.$alert('只有Buildable状态的可以保存！', '错误', {
confirmButtonText: '确定'
})
@@ -1316,6 +1318,18 @@
})
})
},
+ jumpRoute(){
+ let inData={
+ site:this.searchData.site,
+ partNo:this.routeData.partNo,
+ routingType:this.routeData.routingType,
+ routingRevision:this.routeData.routingRevision,
+ }
+ localStorage.setItem('routeData', JSON.stringify(inData))
+ window.open('#/part-routingManagement');
+
+ },
+
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index cd6b0b3..2ce9f36 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -37,12 +37,17 @@
-
-
- Select Quote Specialist
-
+
+
+
+
+
+
+
+
+
@@ -53,7 +58,7 @@
-
+
@@ -74,7 +79,7 @@
-
+
@@ -85,7 +90,7 @@
-
+
@@ -167,6 +172,7 @@
tsdBasicInformationSearch,
searchTechnicalSpecificationTeamStr,
updateBMBasicInformation,
+ searchPartLastQuotationNo,
} from "@/api/sampleManagement/technicalSpecificationList.js"
import {
searchOperatorWithSite,
@@ -178,6 +184,7 @@
},
data() {
return {
+ quotationNo:'',
searchData: {
site: '',
username: this.$store.state.user.name,
@@ -302,7 +309,15 @@
searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
this.dataForm.engineerList = data.rows
})
-
+ let inData4={
+ site:data.row.site,
+ productNo:data.row.testPartNo,
+ }
+ searchPartLastQuotationNo(inData4).then(({data}) => {
+ if(data.rows.length>0){
+ this.quotationNo = data.rows[0].quotationNo
+ }
+ })
} else {
this.dataList = '';
}
@@ -404,6 +419,7 @@
},
jumpPage(type){
if(type==="A"&& this.dataForm.ecnNo!==null&&this.dataForm.ecnNo!==''){
+ this.$refs.jumpA.blur();
let inData={
ecnNo:this.dataForm.ecnNo
}
@@ -411,11 +427,22 @@
window.open('#/changeManagement-changeRecord');
}
if(type==="B"&& this.dataForm.proofingNo!==null&&this.dataForm.proofingNo!==''){
+ this.$refs.jumpB.blur();
let inData={
proofingNo:this.dataForm.proofingNo
}
localStorage.setItem('proofingData', JSON.stringify(inData))
window.open('#/proofing-requestForProofing');
+
+ }
+ if(type==="C"&& this.quotationNo!==null&&this.quotationNo!==''){
+ this.$refs.jumpC.blur();
+ let inData={
+ quotationNo:this.quotationNo
+ }
+ localStorage.setItem('quotationData', JSON.stringify(inData))
+ window.open('#/quotation-sellForQuotation');
+
}
}
},