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/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue index 920d712..977b362 100644 --- a/src/views/modules/base/propertiesItem/propertiesItem.vue +++ b/src/views/modules/base/propertiesItem/propertiesItem.vue @@ -94,6 +94,7 @@ + @@ -110,7 +111,7 @@ - + @@ -139,6 +140,7 @@ + @@ -532,7 +534,7 @@ }, mounted () { this.$nextTick(() => { - this.height = window.innerHeight - 180 + this.height = window.innerHeight - 200 }) }, created () { @@ -719,7 +721,7 @@ } }, addChooseModal(){ - this.itemFlag = this.chooseModalData.valueTypeDb === 'T'?'text':'number'; + this.itemFlag = this.chooseModalData.valueTypeDb === 'N'?'number':'text'; this.itemData = { site: this.$store.state.user.site, itemNo:this.chooseModalData.itemNo, @@ -731,7 +733,7 @@ this.itemModalFlag = true; }, updateChooseModal(row){ - this.itemFlag= this.chooseModalData.valueTypeDb === 'T'?'text':'number'; + this.itemFlag= this.chooseModalData.valueTypeDb === 'N'?'number':'text'; this.itemData={ site: this.$store.state.user.site, itemNo:this.chooseModalData.itemNo, @@ -797,6 +799,11 @@ }).catch(() => { }) }, + changeValueTypeDb(){ + if(this.modalData.itemType!=='BM'&&this.modalData.valueTypeDb==='S'){ + this.modalData.valueTypeDb='T' + } + }, } } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index 63165fb..6b78108 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -99,14 +99,14 @@ prop="effPhaseInDate" header-align="left" align="left" - min-width="50" + min-width="80" label="生效日期"> @@ -441,8 +441,8 @@ }) return false; } - if(this.currentRow.status==='Tentative'){ - this.$alert('Tentative不允许保存！', '错误', { + if(this.currentRow.status!='Buildable'){ + this.$alert('只有Buildable状态的可以保存！', '错误', { confirmButtonText: '确定' }) return false; diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index 2925430..a578cc6 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -39,7 +39,10 @@ width="80" label="数据类型"> @@ -178,6 +191,10 @@ } }); }, + openNewPage(url){ + window.open(this.$store.state.user.bmPicUrl +url); + + }, }, } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue index badbce2..b31ed25 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue @@ -1,285 +1,16 @@ diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 6e70d47..ada91d5 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -330,7 +330,7 @@ - + + + + + @@ -1233,6 +1247,12 @@ }) return false; } + if(this.currentRow.status!='Buildable'){ + this.$alert('只有Buildable状态的可以保存！', '错误', { + confirmButtonText: '确定' + }) + return false; + } let inData={ site:this.routeData.site, codeNo:this.searchData.codeNo, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue new file mode 100644 index 0000000..badbce2 --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue @@ -0,0 +1,420 @@ + + + + +