diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index c1f7211db..ba5a71b0c 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -311,7 +311,7 @@ title="查看人员" :visible.sync="RoleModel" @close="RoleCancle" - size="1100px" + size="900px" class="not-footer-drawer" >
@@ -358,6 +358,11 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> + +

{{ sarStandardsInfoEO.standName || '-' }}

-

{{ sarStandardsInfoEO.standEnName || '-' }}

+

{{ sarStandardsInfoEO.standEnName || '-' }}

+

+ @@ -3235,6 +3236,18 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 186d5cb50..fb599e5ac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -228,19 +228,6 @@ - - - - - - 查询 + @click="QYBZgetBtn">查询 @@ -858,7 +845,7 @@ export default { }, QYBZenterDrawer () { if (this.QYBZformSelect.length > 1) { - this.$message.warning('请选择一条标准') + this.$message.warning('您只能选择一条标准进行带入') } else if (this.QYBZformSelect.length < 1){ this.$message.warning('请选择要带入的标准') } else { @@ -879,6 +866,11 @@ export default { this.QYBZform.pageSize = pageSize this.QYBZget() }, + //企业标准查询 + QYBZgetBtn(){ + this.QYBZform.page = 1 + this.QYBZget() + }, QYBZget () { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { _this: this, loading: 'QYBZShow' @@ -1170,5 +1162,9 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 8ad9539c2..44c9314c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -223,13 +223,6 @@ - - - + placeholder="请输入关联模块--乘用车VPPS编码" + > + + + + + + + + + @@ -1240,18 +1258,6 @@ @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +
@@ -2581,17 +2585,17 @@ export default { popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { if (checkedData && checkedData.length != 0) { if (checkedData.length > 0) { - if (this.drawerTitle2 === 'VPPS编码') { - this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') { + this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") } else { this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") } } else { - if (this.drawerTitle2 === 'VPPS编码') { - this.sarBussionessSearch.VPPSBMBUSS = checkedData.code - this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName + if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') { + this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code + this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName } else { this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName @@ -3637,8 +3641,8 @@ export default { nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss') } // 代替标准号 - if (nowstandinfo.replaceStandNum != null) { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',') + if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) { + nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/，/ig, ',') } if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '
') @@ -4336,37 +4340,29 @@ export default { formFieldList.forEach((item) => { const value = this.sarBussionessSearch[item.attrField] // 时间格式处理 - if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') { - advanceSearchVOList.push({ - connect: "and", - field: 'CYCVPPSBM', - type: 'like', - value: value - }); - }else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') { - advanceSearchVOList.push({ - connect: "and", - field: 'CYCVPPSCN', - type: 'like', - value: value - }); - }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') { + if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') { + advanceSearchVOList.push({ + connect: "and", + field: item.attrField || "", + type: 'EQUALS', + value: value + }); + }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) { advanceSearchVOList.push({ connect: advanceSearchVOList.length > 0 ? "and" : "", field: item.attrField || "", type: "between", + value: (value ? value[0]+','+value[1] : "") || "", + }); + }else if (value !== undefined && value !== null && value !== "") { + advanceSearchVOList.push({ + connect: "and", + field: item.attrField || "", + type: 'like', value: value }); } }) - if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') { - advanceSearchVOList.push({ - connect: "and", - field: 'BARQ', - type: 'EQUALS', - value: formData.BARQ - }); - } } formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); this.SarExportSearchEo = formData; @@ -4757,6 +4753,8 @@ export default { } if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') { rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'}) + }else if(item.attrLen && item.attrType === 'INPUT_STR'){ + rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) } if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') { rule.push({