diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less index 7ab7d7a88..d73daf347 100644 --- a/src/assets/styles/phone.less +++ b/src/assets/styles/phone.less @@ -2,3 +2,8 @@ width: 100%; height: 100%; } +@media screen and (max-width: 1366px) { + .el-message { + min-width: 200px !important; + } +} diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index ebfc39406..51d8dc21e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3599,7 +3599,8 @@ export default { } & > div:not(.modular-item-more) { - /*border-bottom: 1px solid #E5E5E5;*/ + //英文名称变粗 + border-bottom: 1px solid #E5E5E5; min-height: 43px; line-height: 43px; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 6fb9806c1..f0847398f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -29,7 +29,7 @@ 海外标准入库 - + { + this.form = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.form.standSystem] + this.defaultCheckedKeys1 = [this.form.cycvppsbm] + this.defaultCheckedKeys2 = [this.form.kccvppsbm] + this.defaultCheckedKeys3 = [this.form.dybxh] + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){ + this.form.country=this.form.country.split(","); + } + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { @@ -1822,7 +1842,7 @@ this.verifySarStandard = true this.clearFormData(this.form) break - // 带入 + // 带入(确认) case 2: if (this.standardCheckedList.length === 1) { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { @@ -1853,7 +1873,10 @@ this.key3++ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + console.log(this.form) this.form.ssrq = this.$moment(this.form.ssrq).format("YYYY-MM-DD") + this.form.zccssrq = this.$moment(this.form.zccssrq).format("YYYY-MM-DD") + this.form.xcxssrq = this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = bringData.id diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index a501aee13..002c2edbe 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -265,18 +265,20 @@ prop="name" label="任务步骤" align="center" - width="120" + width="130" >