Merge remote-tracking branch 'origin/master'

jero-web/src/components/jero/JUpload.vue

@@ -355,6 +355,14 @@ export default {
         file.uploadGoOn = false
         return false
       }
+      if (this.fileType === 'docx') {
+        if (!(fileSuffix === 'docx')) {
+          this.$message.warning(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file'))
+          this.uploadGoOn = false
+          file.uploadGoOn = false
+          return false
+        }
+      }
       if (this.fileType.indexOf(fileSuffix) === -1) {
         this.$message.warning(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file'))
         this.uploadGoOn = false

jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue

@@ -71,7 +71,7 @@
                       return-id
                       :number="1"
                       class="line-btn"
-                      file-type="doc,docx" />
+                      file-type="docx" />
           </div>
         </a-form-item>
       </a-form>