vue2-client 1.19.43 → 1.19.44

package/.env.development

@@ -0,0 +1 @@
+VUE_APP_API_BASE_URL=http://localhost:8001

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.43",
+  "version": "1.19.44",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/assets/svg/female.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#D15DFF" fill-opacity="1"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#D15DFF" fill-opacity="1"/></g></svg>

package/src/assets/svg/male.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#0057FE" fill-opacity="1"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#0057FE" fill-opacity="1"/></g></svg>

package/src/base-client/components/common/HIS/HFormGroup/index.js

@@ -1,3 +1,3 @@
-import HFormGroup from './HFormGroup.vue'
-
-export default HFormGroup
+import HFormGroup from './HFormGroup.vue'
+
+export default HFormGroup

package/src/base-client/components/common/Upload/Upload.vue

@@ -106,7 +106,10 @@ export default {
       previewVisible: false,
       previewImage: '',
       previewImageName: '',
-      showScanner: false
+      showScanner: false,
+      uploadQueue: [],
+      isUploading: false,
+      uploadControllers: new Map()
     }
   },
   props: {
@@ -159,10 +162,10 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' }),
+    ...mapState('account', {currUser: 'user'}),
     ...mapState('setting', ['compatible'])
   },
-  created () {
+  created() {
     const list = this.model.type === 'file' ? [...this.files] : [...this.images]
     if (this.model.useType) {
       // {uid,url,name,f_use_type?,f_form_type?}
@@ -180,7 +183,7 @@ export default {
     }
   },
   methods: {
-    async handlePreview (file) {
+    async handlePreview(file) {
       if (this.isImageFile(file)) {
         // 图片文件：预览
         this.previewImage = file.url
@@ -192,7 +195,7 @@ export default {
       }
     },
 
-    async handleDownload (file) {
+    async handleDownload(file) {
       const link = document.createElement('a')
       link.href = file.url
       link.download = file.name || 'download'
@@ -202,13 +205,13 @@ export default {
       document.body.removeChild(link)
     },
 
-    isImageFile (file) {
+    isImageFile(file) {
       const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
       const fileName = file.name ? file.name.toLowerCase() : ''
       return imageExtensions.some(ext => fileName.endsWith(ext))
     },
 
-    confirmPhoto (img) {
+    confirmPhoto(img) {
       const fileName = `GaoPaiYi_${moment().format('YYYYMMDDHHmmss')}.png`
       const file = base64ToFile(img, fileName)
       file.uid = fileName
@@ -218,21 +221,50 @@ export default {
       this.uploadFiles(info)
     },
 
-    useScannerUpload (e) {
+    useScannerUpload(e) {
       // 打开高拍仪
       this.showScanner = true
     },
 
-    handleCancelScanner () {
+    handleCancelScanner() {
       // 关闭高拍仪弹窗
       this.showScanner = false
     },
+    uploadFiles(info) {
+      // 添加到上传队列
+      this.uploadQueue.push(info)
+      // 如果当前没有上传任务，开始处理队列
+      if (!this.isUploading) {
+        this.processUploadQueue()
+      }
+    },
+
+    // 处理上传队列
+    async processUploadQueue() {
+      if (this.uploadQueue.length === 0) {
+        this.isUploading = false
+        return
+      }
+      this.isUploading = true
+      // 从队列中取出第一个任务
+      const info = this.uploadQueue.shift()
+      await this.singleFileUpload(info)
+      // 继续处理队列中的下一个任务
+      this.processUploadQueue()
+    },
 
-    uploadFiles (info) {
+    // 单个文件上传
+    async singleFileUpload(info) {
+      // 检查文件数量限制
       if (this.uploadedFileList.length >= this.model.acceptCount) {
         this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
         return
       }
+
+      // 创建取消控制器
+      const controller = new AbortController()
+      this.uploadControllers.set(info.file.uid, controller)
+
       // 初始化文件信息
       const fileInfo = {
         uid: info.file.uid,
@@ -241,66 +273,118 @@ export default {
         response: '',
         url: '',
       }
-      // 放入上传列表中，以便于显示上传进度
-      this.uploadedFileList.push(fileInfo)
-      // 组装上传数据
-      const headers = {
-        'Content-Type': 'multipart/form-data',
-      }
-      const formData = new FormData()
-      formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey ?? 'Default')
-      }
-      // formData.append('stockAlias', this.model.stockAlias)
-      formData.append('formType', this.model.type)
-      formData.append('useType', this.model.useType ?? 'Default')
-      formData.append('resUploadStock', this.model.resUploadStock ?? 1)
-      formData.append('filename', info.file.name)
-      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
-      formData.append('f_operator', this.currUser ? this.currUser.username : '')
 
-      upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
-        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+      // 使用不可变更新，避免状态冲突
+      this.uploadedFileList = [...this.uploadedFileList, fileInfo]
+
+      try {
+        // 组装上传数据
+        const headers = {
+          'Content-Type': 'multipart/form-data',
+        }
+        const formData = new FormData()
+        formData.append('avatar', info.file)
+        formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
+        if (this.model.pathKey) {
+          formData.append('pathKey', this.model.pathKey ?? 'Default')
+        }
+        formData.append('formType', this.model.type)
+        formData.append('useType', this.model.useType ?? 'Default')
+        formData.append('resUploadStock', this.model.resUploadStock ?? 1)
+        formData.append('filename', info.file.name)
+        formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
+        formData.append('f_operator', this.currUser ? this.currUser.username : '')
+
+        const res = await upload(formData, this.serviceName, {
+          headers,
+          timeout: 600 * 1000,
+          signal: controller.signal // 添加取消信号
+        })
+
+        // 根据服务端返回的结果判断成功与否
         if (res.success || res.id) {
-          fileInfo.status = 'done'
-          let dataObj
-          if (res.id) {
-            dataObj = res
-          } else if (typeof res.data === 'string') {
-            dataObj = JSON.parse(res.data)
-          } else {
-            dataObj = res.data
-          }
-          fileInfo.response = dataObj
-          fileInfo.id = dataObj.id
-          // 如果新上传的图片是V4，需要携带serviceName前缀，但是同时也要回显老系统图片
-          if (this.imgPrefix) {
-            fileInfo.url = this.imgPrefix + dataObj.f_downloadpath
-          } else {
-            fileInfo.url = dataObj.f_downloadpath
-          }
-          if (this.outerContainerIndex !== undefined) {
-            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
-          } else {
-            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-            this.$emit('setFilesAllInfo', this.uploadedFileList.filter(item => item.status === 'done').map(item => item))
-          }
+          this.updateFileStatus(info.file.uid, 'done', res)
           this.$message.success('上传成功！')
         } else {
-          fileInfo.status = 'error'
-          fileInfo.response = res.data
+          this.updateFileStatus(info.file.uid, 'error', res.data)
+          this.$message.error('上传失败！')
+        }
+      } catch (error) {
+        if (error.name !== 'AbortError') {
+          // 非取消错误才显示错误信息
+          this.updateFileStatus(info.file.uid, 'error', error)
           this.$message.error('上传失败！')
         }
-      }).catch((e) => {
-        fileInfo.status = 'error'
-        fileInfo.response = e
+      } finally {
+        // 清理取消控制器
+        this.uploadControllers.delete(info.file.uid)
+      }
+    },
+
+    // 更新文件状态
+    updateFileStatus(uid, status, response) {
+      this.uploadedFileList = this.uploadedFileList.map(item => {
+        if (item.uid === uid) {
+          const updatedItem = {
+            ...item,
+            status,
+            response
+          }
+
+          if (status === 'done') {
+            let dataObj
+            if (response.id) {
+              dataObj = response
+            } else if (typeof response.data === 'string') {
+              dataObj = JSON.parse(response.data)
+            } else {
+              dataObj = response.data
+            }
+
+            updatedItem.response = dataObj
+            updatedItem.id = dataObj.id
+            // 如果新上传的图片是V4，需要携带serviceName前缀
+            if (this.imgPrefix) {
+              updatedItem.url = this.imgPrefix + dataObj.f_downloadpath
+            } else {
+              updatedItem.url = dataObj.f_downloadpath
+            }
+          }
+
+          return updatedItem
+        }
+        return item
       })
+
+      this.emitFilesUpdate()
+    },
+
+    // 触发文件更新事件
+    emitFilesUpdate() {
+      const doneFiles = this.uploadedFileList.filter(item => item.status === 'done')
+
+      if (this.outerContainerIndex !== undefined) {
+        this.$emit('setFiles', doneFiles, this.outerContainerIndex)
+      } else {
+        this.$emit('setFiles', doneFiles.map(item => item.id))
+        this.$emit('setFilesAllInfo', doneFiles)
+      }
+    },
+
+    // 取消上传（可选功能）
+    cancelUpload(uid) {
+      const controller = this.uploadControllers.get(uid)
+      if (controller) {
+        controller.abort()
+
+        // 从上传列表中移除
+        this.uploadedFileList = this.uploadedFileList.filter(item => item.uid !== uid)
+        this.emitFilesUpdate()
+      }
     },
 
     // 删除文件
-    deleteFileItem (file) {
+    deleteFileItem(file) {
       const that = this
       this.$confirm({
         title: '提醒',
@@ -309,35 +393,38 @@ export default {
         okType: 'danger',
         cancelText: '取消',
         zIndex: 2000,
-        onOk () {
+        onOk() {
+          // 如果文件正在上传，先取消上传
+          if (file.status === 'uploading') {
+            that.cancelUpload(file.uid)
+          }
+
           //  阳春博能工单信息V4页面有时会删除V3照片, V3照片不能通过这个请求删除, 已经在外层进行删除处理
           if (file.id && !file.version) {
             switch (that.compatible) {
               case 'V3':
-                fileDelete({ id: file.id, f_state: '删除' })
+                fileDelete({id: file.id, f_state: '删除'})
                   .then(res => {
                   }).catch(e => {
                 })
                 break
               case 'V4':
-                fileDeleteV4({ id: file.id, resDeleteMode: 'server' })
+                fileDeleteV4({id: file.id, resDeleteMode: 'server'})
                   .then(res => {
                   }).catch(e => {
                 })
                 break
             }
           }
-          // 找到当前文件所在列表的索引
-          const index = that.uploadedFileList.indexOf(file)
           // 从列表中移除该文件
-          that.uploadedFileList.splice(index, 1)
+          that.uploadedFileList = that.uploadedFileList.filter(item => item.uid !== file.uid)
           if (that.outerContainerIndex !== undefined) {
             that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done'), that.outerContainerIndex)
           } else {
             that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
           }
         },
-        onCancel () {
+        onCancel() {
           console.log('取消删除')
         },
       })