diff --git a/src/api/base/site.js b/src/api/base/site.js index 02a7a04..bceb170 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -75,3 +75,4 @@ export const searchAccessRoleList = data => createAPI(`/base/searchAccessRoleLis export const searchWorkCenterBMType= data => createAPI(`/properties/searchWorkCenterBMType`,'post',data) export const updateWorkCenterBMType= data => createAPI(`/properties/updateWorkCenterBMType`,'post',data) export const getPlmRouteItemType= data => createAPI(`/properties/getPlmRouteItemType`,'post',data) +export const getUserAccessSite= data => createAPI(`/base/getUserAccessSite`,'post',data) diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 96b245f..01f4214 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -97,3 +97,4 @@ export const updateBMRouteRev= data => createAPI(`/technicalSpecification/update export const searchBMRemarkPage= data => createAPI(`/technicalSpecification/searchBMRemarkPage`,'post',data) export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/updateBMRemarkPage`,'post',data) +export const updateBMProcess= data => createAPI(`/technicalSpecification/updateBMProcess`,'post',data) diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index dd4e45a..f5d50ac 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -66,3 +66,14 @@ display: flex; justify-content: center; /* 水平居中 */ } + +.superInput { + border-bottom: 1px solid #00fff7; /* 下划线样式 */ + font-weight: bold; /* 加粗文字 */ + color: #00fff7; /* 文字颜色 */ +} + +.blue-input .el-input__inner { + font-weight: bold; + color: dodgerblue; +} diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index ea64642..5fb668e 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -22,7 +22,7 @@ class="site-navbar__menu site-navbar__menu--right" mode="horizontal"> - {{siteNow}} + {{siteNow}} @@ -79,7 +79,23 @@ - + + + + + + + + + + + + + 确定 + 取消 + + @@ -102,6 +118,7 @@ import { import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import { getSiteData, + getUserAccessSite, } from "@/api/base/site.js" export default { inject: ['refresh'], @@ -114,7 +131,9 @@ export default { updatePassowrdVisible: false, updateLanguageVisible: false, helpFileVisible: false, - + site:'', + siteList:'', + siteFlag:false, message: this.$t('language.name'), languageList: [], pageLanguage: { @@ -413,7 +432,25 @@ export default { } } }) - } + }, + siteModel(){ + this.site=this.$store.state.user.site + getUserAccessSite({username:this.$store.state.user.name}).then(({data})=>{ + this.siteList=data.rows + }) + this.siteFlag=true + }, + changeSite(){ + //修改工厂 2个缺一不可 + this.$store.commit('user/updateSite', this.site) + localStorage.setItem('accessSite', this.site) + this.siteFlag=false + this.getNowSite() + this.$nextTick(function () { + // 在 DOM 更新之后执行的操作 + window.location.reload() + }); + }, }, created() { this.getLanguageList() diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 0b6a599..b315cbb 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -1469,6 +1469,7 @@ }, created () { + this.getDataList() this.getEcnModel() }, @@ -1665,6 +1666,11 @@ // 获取数据列表 getDataList () { + if(localStorage.getItem('ecnData')!=undefined){ + let data=JSON.parse(localStorage.getItem('ecnData')); + this.searchData.changeNo=data.ecnNo + localStorage.removeItem('ecnData'); + } this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex changeRecordSearch(this.searchData).then(({data}) => { diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index abf1e56..7f2ba4a 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -2,6 +2,9 @@
+ + + @@ -1033,6 +1036,7 @@ projectName: '', engineerName: '', priorityLevel: '', + proofingNo:'', page: 1, limit: 10 }, @@ -2025,6 +2029,11 @@ * 获取数据列表 */ getDataList () { + if(localStorage.getItem('proofingData')!=undefined){ + let data=JSON.parse(localStorage.getItem('proofingData')); + this.searchData.proofingNo=data.proofingNo + localStorage.removeItem('proofingData'); + } this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex proofingInformationSearch(this.searchData).then(({data}) => { diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index a5c57da..8a895b4 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -10,6 +10,9 @@ 打样单号 + + 保存后跳转至详情 + @@ -181,6 +184,7 @@ }, data () { return { + jumpFlag:false, tagNo:'', tagNo1:'', visible: false, @@ -316,6 +320,7 @@ } }, init (id) { + this.jumpFlag=false this.dataForm.id = id || 0 if(this.dataForm.id!=0){ let inData={ @@ -511,6 +516,18 @@ this.$message.success( '操作成功') this.visible = false this.$emit('refreshDataList') + if(this.jumpFlag){ + this.$nextTick(function () { + let inData={ + site:this.$store.state.user.site, + codeNo:data.row.codeNo, + buNo:data.row.buNo, + username:this.$store.state.user.name}; + localStorage.setItem('tsfData', JSON.stringify(inData)) + window.open('#/BMPage'); + }) + } + } else { this.$message.error(data.msg) } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index 09bfcea..9568910 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -12,16 +12,16 @@
-
- - - -
-
- - - -
+ + + + + + + + + +
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index a578cc6..a53d8cb 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -135,7 +135,9 @@ } //this.searchData.type= JSON.parse(JSON.stringify(this.type)); //刷新表格 - this.$nextTick(()=>{this.searchTable();} ) + this.$nextTick(()=>{ + this.searchTable(); + } ) }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index ada91d5..95fcf32 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -1,5 +1,13 @@