修改禅道已知bug

jero-web/src/common/lang/en-us.js

@@ -1235,5 +1235,7 @@ module.exports = {
   addComparison: 'Add comparison',
   showOrNot: 'Show or not',
   comparisonMarket: 'Comparison Market',
-  share: 'share'
+  share: 'share',
+  simplifiedChinese:'Simplified Chinese',
+  uploadOnly:'Upload only',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1339,4 +1339,6 @@ module.exports = {
   showOrNot:'是否展示',
   comparisonMarket:'对比市场',
   share:'分享',
+  simplifiedChinese:'简体中文',
+  uploadOnly:'只能上传',
 }

jero-web/src/components/uploadFile/file.vue

@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
     data() {
       return {
         visible: false,
@@ -68,7 +68,7 @@
       if (this.isMultiple) {
         this.multiple = false
       }
-      this.accept = this.restrictUploads ? '.docx,.doc' : '*.*'
+      this.accept = this.restrictUploads ? this.Uploadable : '*.*'
       // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
     },
     methods: {
@@ -99,10 +99,10 @@
           let index1 = fileName.lastIndexOf('.')
           let index2 = fileName.length
           let fileSuffix = fileName.substring(index1, index2)
-          if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          if (this.Uploadable.includes(fileSuffix)) {
 
           } else {
-            this.$message.warning(this.$t('onlyFilesUploaded'))
+            this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file'))
             return false
           }
         }

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -44,7 +44,7 @@
         :columns="columns"
       >
           <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 slot="RegulationMonthlyName" slot-scope="text,record">
              <a @click="preview(record)">{{text}}</a>
@@ -151,7 +151,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 240,
             scopedSlots: { customRender: 'operation' }
           }
         ]
@@ -179,7 +179,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(page,pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()
@@ -220,9 +220,9 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
         } 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 })
-          }else{
+          } else {
             this.$message.warning(this.$t('theDoesNotSupportPreview'))
           }
         }

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -97,7 +97,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 280,
             scopedSlots: { customRender: 'operation' }
           }
         ]

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue

@@ -51,6 +51,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
+                          :disabled="isParentId"
                           v-model="formInline.parentId">
                   <a-select-option v-for="(item, key) in ParentList"
                                    :key="item.id"
@@ -110,7 +111,8 @@
         url: {
           add: '/report/lawsMonthlyReportTitleTemplateEO/add',
           edit: '/report/lawsMonthlyReportTitleTemplateEO/edit'
-        }
+        },
+        isParentId: false
       }
     },
     mounted() {
@@ -131,6 +133,7 @@
         this.visible = true
         this.getParent()
         this.$nextTick(() => {
+          this.isParentId = false
           this.formInline = {}
           this.$refs.ruleForm.clearValidate()
         })
@@ -139,8 +142,13 @@
         this.title = this.$t('edit')
         this.visible = true
         this.getParent()
+        this.isParentId = false
         this.$nextTick(() => {
           this.formInline = row
+          if (!row.parentId) {
+            this.formInline.parentId = undefined
+            this.isParentId = true
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },

jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue

@@ -38,7 +38,6 @@
                 <a-form-model-item class="itemModel" prop="language">
                   <a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')"
                             :disabled="disabled"
-                            class="box-input"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             allowClear
                             v-model="formInline.language">
@@ -61,7 +60,8 @@
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </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>
 </template>
 
@@ -95,7 +95,7 @@
         visible: false,
         languageList: [
           {
-            text: this.$t('chinese'),
+            text: this.$t('simplifiedChinese'),
             value: 1
           },
           {
@@ -275,7 +275,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: 100%;
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;

jero-web/src/views/documentTools/documentTranslation/components/addModel.vue

@@ -94,7 +94,7 @@
         </a-row>
       </a-form-model>
     </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"/>
   </div>
 </template>

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -41,18 +41,15 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text"
-                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
-                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
-                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                                    }]">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="item.issueOrSuggest"
-                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
+                <a-form-model-item class="itemModel" prop="accessoryFile">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -67,25 +64,26 @@
                                    :prop="'dataList.'+index+'.reason'"
                                    :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="item.reason"
-                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
+                              :disabled="disabled"
+                              v-model="item.reason" :rows="4"/>
                 </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
               <div class="box-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>
-                <a-form-model-item class="itemModel" prop="accessoryFile">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessoryFile',index)">
-                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
-                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
+                              :disabled="disabled"
+                              v-model="item.issueOrSuggest" :rows="4"/>
                 </a-form-model-item>
               </div>
             </a-col>