diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue index 38f2728e5..aa3e5a3ba 100644 --- a/src/components/CustomFormComponents/Input.vue +++ b/src/components/CustomFormComponents/Input.vue @@ -12,6 +12,9 @@ :value="value" :placeholder="placeholder" :disabled="disabled" + type="textarea" + resize="none" + :autosize="true" clearable @input="handleChange" > @@ -63,6 +66,15 @@ export default { } - diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index 8c74fdbfb..0fdc6e1bb 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -1,73 +1,78 @@ @@ -180,7 +195,7 @@ export default { default: '150px' } }, - data () { + data() { return { replaceLawsNumModel: false, sarBussionessLawsEO: { @@ -212,28 +227,28 @@ export default { } }, computed: { - placeholder () { + placeholder() { return `请输入${this.config.attrName}` }, - showMessage () { + showMessage() { return `${this.config.attrName}不能为空` }, - isRequired () { + isRequired() { return !!this.config.isMust } }, methods: { - getReplaceLawsNumRowSearch () { + getReplaceLawsNumRowSearch() { this.replaceLawsNumForm.page = 1 this.replacePage = 1 this.getReplaceLawsNumRow() }, - handleChange (event) { + handleChange(event) { // const value = event.target.value const value = event this.$emit('input', value) }, - selectLaws () { + selectLaws() { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -242,7 +257,7 @@ export default { this.getReplaceLawsNumRow() }, // 代替政策号 请求数据 - getReplaceLawsNumRow () { + getReplaceLawsNumRow() { if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1 } else { @@ -257,7 +272,7 @@ export default { formData.standType = this.replaceLawsNumForm.dataSource === 'INLAND_STAND' ? 'INLAND' : this.replaceLawsNumForm.dataSource === 'FOREIGN_STAND' ? 'FOREIGN' : '' formData.standNumber = formData.numberName - let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' + let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' this.$http.get(url, formData, { _this: this, loading: 'replaceLoading' @@ -277,27 +292,27 @@ export default { }) }, // 代替政策编号-取消 - replaceLawsNumModelCancel () { + replaceLawsNumModelCancel() { // this.replaceLawsNumModel = false this.$refs.selections.clearSelection() }, // 代替政策号 table选择事件 - selectReplaceStandNumRowChange (row) { + selectReplaceStandNumRowChange(row) { this.selectedListRep = row }, // 代替政策分页 - pageChangeReplace (page) { + pageChangeReplace(page) { this.replacePage = page this.replaceLawsNumForm.page = page this.getReplaceLawsNumRow() }, - pageSizeChangeReplace (pageSize) { + pageSizeChangeReplace(pageSize) { // this.replaceRows = pageSize this.replaceLawsNumForm.pageSize = pageSize this.getReplaceLawsNumRow() }, // 代替政策编号确定 - replaceLawsNumModelBt () { + replaceLawsNumModelBt() { let textArr = [] if (typeof this.value === 'string') { @@ -342,7 +357,7 @@ export default { this.$refs.selections.clearSelection() }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let name = '' let pageType = '' switch (this.dataSource) { @@ -369,7 +384,7 @@ export default { window.open(routeUrl.href, '_blank') }, - getResetLawsNumRow () { + getResetLawsNumRow() { this.replaceLawsNumForm = { dataSource: 'BUSINESS', numberName: '', // 政策编号 @@ -387,13 +402,23 @@ export default { diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue index 69a6e9f69..dc59712d8 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue @@ -185,7 +185,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue index 1a97d9e98..44e1c8863 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue @@ -174,7 +174,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 970392e3e..d2775ce22 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3688,6 +3688,7 @@ export default { //报批稿撑开 //top: 10px; right: 0; + top:-20px; padding: 0 10px; height: 30px; line-height: 30px; diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index e585b1928..7291d830e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1707,7 +1707,7 @@ export default { if (res.ok) { let imgPath = res.data.filePath let imgName = res.data.fileName - let imgSrc = 'uploadPath' + imgPath + imgName + let imgSrc = 'file' + imgPath + imgName // let imgSrc = imgPath + imgName // this.itemsContentList[this.saveUploadImgIndex].itemContent = 'uploadPath' + imgPath + imgName this.itemsContentList[this.saveAddIndex + 1].itemContent = '' diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue index 4fb19a066..5a01a5c5c 100644 --- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue +++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue @@ -87,7 +87,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/personal/pages/personal-info/components/PersonalData.vue b/src/pages/personal/pages/personal-info/components/PersonalData.vue index 8fd9e170b..d315952ed 100644 --- a/src/pages/personal/pages/personal-info/components/PersonalData.vue +++ b/src/pages/personal/pages/personal-info/components/PersonalData.vue @@ -194,7 +194,7 @@ export default { loading: 'loading' }, res => { this.userInfo.userPic = res.data.id - this.userAvator = 'uploadPath' + res.data.filePath + res.data.fileName + this.userAvator = 'file' + res.data.filePath + res.data.fileName }) }, // 保存用户信息 diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index e3167ef54..c675cb441 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -22,7 +22,7 @@ export default { value: "laws1" }, { - label: "企标制修订流程及企业标准库流程", + label: "企标制修订-技术标准", value: "buss1" }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 3185e6547..fe3c2beae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1,7 +1,7 @@