WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-08-04 17:50:00 +08:00
parent e43ff1cb3f
commit fccf1cbf6a
9 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+3 -1
View File
@@ -1235,5 +1235,7 @@ module.exports = {
addComparison: 'Add comparison', addComparison: 'Add comparison',
showOrNot: 'Show or not', showOrNot: 'Show or not',
comparisonMarket: 'Comparison Market', comparisonMarket: 'Comparison Market',
share: 'share' share: 'share',
simplifiedChinese:'Simplified Chinese',
uploadOnly:'Upload only',
} }
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1339,4 +1339,6 @@ module.exports = {
showOrNot:'是否展示', showOrNot:'是否展示',
comparisonMarket:'对比市场', comparisonMarket:'对比市场',
share:'分享', share:'分享',
simplifiedChinese:'简体中文',
uploadOnly:'只能上传',
} }
jero-web/src/components/uploadFile/file.vue
+4 -4
View File
@@ -34,7 +34,7 @@
export default { export default {
name: 'file', name: 'file',
props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'], props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
data() { data() {
return { return {
visible: false, visible: false,
@@ -68,7 +68,7 @@
if (this.isMultiple) { if (this.isMultiple) {
this.multiple = false this.multiple = false
} }
this.accept = this.restrictUploads ? '.docx,.doc' : '*.*' this.accept = this.restrictUploads ? this.Uploadable : '*.*'
// console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
}, },
methods: { methods: {
@@ -99,10 +99,10 @@
let index1 = fileName.lastIndexOf('.') let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2) let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.docx' || fileSuffix == '.doc') { if (this.Uploadable.includes(fileSuffix)) {
} else { } else {
this.$message.warning(this.$t('onlyFilesUploaded')) this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file'))
return false return false
} }
} }
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+5 -5
View File
@@ -44,7 +44,7 @@
:columns="columns" :columns="columns"
> >
<span slot="language" slot-scope="text,record"> <span slot="language" slot-scope="text,record">
<span>{{text == 1?$t('chinese'):$t('English')}}</span> <span>{{text == 1?$t('simplifiedChinese'):$t('English')}}</span>
</span> </span>
<span slot="RegulationMonthlyName" slot-scope="text,record"> <span slot="RegulationMonthlyName" slot-scope="text,record">
<a @click="preview(record)">{{text}}</a> <a @click="preview(record)">{{text}}</a>
@@ -151,7 +151,7 @@
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'center',
fixed: 'right', fixed: 'right',
width: 180, width: 240,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
] ]
@@ -179,7 +179,7 @@
this.pageNo = page this.pageNo = page
this.getList() this.getList()
}, },
SizeChange(page,pageSize) { SizeChange(page, pageSize) {
this.pageNo = 1 this.pageNo = 1
this.pageSize = pageSize this.pageSize = pageSize
this.getList() this.getList()
@@ -220,9 +220,9 @@
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
} else { } else {
if (item.createBy == this.userInfo().username){ if (item.createBy == this.userInfo().username) {
downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username }) downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
}else{ } else {
this.$message.warning(this.$t('theDoesNotSupportPreview')) this.$message.warning(this.$t('theDoesNotSupportPreview'))
} }
} }
jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+1 -1
View File
@@ -97,7 +97,7 @@
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'center',
fixed: 'right', fixed: 'right',
width: 180, width: 280,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
] ]
jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+9 -1
View File
@@ -51,6 +51,7 @@
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
:disabled="isParentId"
v-model="formInline.parentId"> v-model="formInline.parentId">
<a-select-option v-for="(item, key) in ParentList" <a-select-option v-for="(item, key) in ParentList"
:key="item.id" :key="item.id"
@@ -110,7 +111,8 @@
url: { url: {
add: '/report/lawsMonthlyReportTitleTemplateEO/add', add: '/report/lawsMonthlyReportTitleTemplateEO/add',
edit: '/report/lawsMonthlyReportTitleTemplateEO/edit' edit: '/report/lawsMonthlyReportTitleTemplateEO/edit'
} },
isParentId: false
} }
}, },
mounted() { mounted() {
@@ -131,6 +133,7 @@
this.visible = true this.visible = true
this.getParent() this.getParent()
this.$nextTick(() => { this.$nextTick(() => {
this.isParentId = false
this.formInline = {} this.formInline = {}
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
}) })
@@ -139,8 +142,13 @@
this.title = this.$t('edit') this.title = this.$t('edit')
this.visible = true this.visible = true
this.getParent() this.getParent()
this.isParentId = false
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = row this.formInline = row
if (!row.parentId) {
this.formInline.parentId = undefined
this.isParentId = true
}
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
}) })
}, },
jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue
+4 -4
View File
@@ -38,7 +38,6 @@
<a-form-model-item class="itemModel" prop="language"> <a-form-model-item class="itemModel" prop="language">
<a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')" <a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')"
:disabled="disabled" :disabled="disabled"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear allowClear
v-model="formInline.language"> v-model="formInline.language">
@@ -61,7 +60,8 @@
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button> <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div> </div>
</a-drawer> </a-drawer>
<uploadFile ref="uploadFile" :isMultiple="true" @uploadSuccess="uploadSuccess"></uploadFile> <uploadFile ref="uploadFile" :restrictUploads="true" :isMultiple="true" :Uploadable="'.docx,.doc,.pdf'"
@uploadSuccess="uploadSuccess"></uploadFile>
</div> </div>
</template> </template>
@@ -95,7 +95,7 @@
visible: false, visible: false,
languageList: [ languageList: [
{ {
text: this.$t('chinese'), text: this.$t('simplifiedChinese'),
value: 1 value: 1
}, },
{ {
@@ -275,7 +275,7 @@
.button-text { .button-text {
height: 38px; height: 38px;
width: calc(100% - 100px); width: 100%;
line-height: 38px; line-height: 38px;
background: #fff; background: #fff;
border: 1px #00B3BE solid; border: 1px #00B3BE solid;
jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
+1 -1
View File
@@ -94,7 +94,7 @@
</a-row> </a-row>
</a-form-model> </a-form-model>
</a-modal> </a-modal>
<uploadFile ref="uploadFile" :restrictUploads="true" :isMultiple="true" @uploadSuccess="uploadSuccess"/> <uploadFile ref="uploadFile" :restrictUploads="true" :Uploadable="'.docx,.doc,'" :isMultiple="true" @uploadSuccess="uploadSuccess"/>
<standardData ref="standardDataRef" @standardDataForm="standardDataForm"/> <standardData ref="standardDataRef" @standardDataForm="standardDataForm"/>
</div> </div>
</template> </template>
jero-web/src/views/processCenter/components/feedbackInformation.vue
+21 -23
View File
@@ -41,18 +41,15 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" <a-form-model-item class="itemModel" prop="accessoryFile">
:rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'}, <a-button type="primary" class="button-text"
{max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' @click="clickButtonToUpload('accessoryFile',index)">
}]"> {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
<a-input class="box-input" item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
:disabled="disabled" }}
v-model="item.issueOrSuggest" </a-button>
:placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -67,25 +64,26 @@
:prop="'dataList.'+index+'.reason'" :prop="'dataList.'+index+'.reason'"
:rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]"> }]">
<a-input class="box-input" <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
:disabled="disabled" :disabled="disabled"
v-model="item.reason" v-model="item.reason" :rows="4"/>
:placeholder="$t('PleaseEnter')+$t('reason')"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span> <span class="Required">*</span>
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="accessoryFile"> <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
<a-button type="primary" class="button-text" :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
@click="clickButtonToUpload('accessoryFile',index)"> {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
{{ (item.accessoryFile === 'null' || item.accessoryFile === '' || }]">
item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
}} :disabled="disabled"
</a-button> v-model="item.issueOrSuggest" :rows="4"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>