Quellcode durchsuchen

Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

cfort vor 3 Jahren
Ursprung
Commit
a76f76dd72

+ 130 - 127
src/business/platform/file/attachment/editFile/editor.vue

@@ -1,137 +1,140 @@
 <!--onlyoffice 编辑器-->
 <template>
-  <div>
-      <div
-      id="editorDiv"
-      class="nav"
-      ref = "editor"/>
-  </div>
+    <div>
+        <div id="editorDiv" class="nav" ref="editor" />
+    </div>
 </template>
 
 <script>
-import { handleDocType } from './editor/editor.js'
-import { showView } from '@/api/platform/file/attachment'
-import { getToken } from '@/utils/auth'
-export default {
-  name: 'editor',
-  props: {
-    option: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      doctype: '',
-      newId:'',
-      timer:'',
-      configKey:''
-    }
-  },
-  mounted() {
-    /* 调用初始化方法 ,渲染wps*/
-    if (this.option.url) {
-      this.setEditor(this.option)
-    }
-    if(this.option.mode == 'edit'){
-      /* 编辑模式下,开启定时任务,每0.5秒轮询 */
-      this.timer = setInterval(() => {
-         if(this.configKey){
-           showView({key:this.configKey}).then(response => {
-           if(response.variables.data!='0' && this.newId != response.variables.data){//则返回替换文件id
-                 this.newId = response.variables.data //记录当前id 且返回变动的文件id,证明有做修改。 提示并替换
-                 this.$message({
-                            message: '文件编辑保存成功,稍后请提交表单!',
-                            type: 'success'
-                          });
-                  this.$emit('updateFile', this.newId)
+    import { handleDocType } from './editor/editor.js'
+    import { showView } from '@/api/platform/file/attachment'
+    import { getToken } from '@/utils/auth'
+    export default {
+        name: 'editor',
+        props: {
+            option: {
+                type: Object,
+                default: () => {
+                    return {}
                 }
-            })
-         }
-        /* 进行后端接口轮询,查到id则进行与当前id比较,相等则不做操作,不相等则返回id,更新页面数据。同时继续查询*/
-          }, 1000);
-      }
-
-  },
-   beforeDestroy() {
-      // 页面关闭钱,清空定时任务
-      this.clearTimer();
-    },
-  methods: {
-    /* 定时任务关闭*/
-      clearTimer() {
-          if(this.timer) {
-            clearInterval(this.timer);
-            this.timer = null;
-          }
+            }
         },
-
-    setEditor(option) {
-      this.doctype = handleDocType(option.fileType)
-      let config = {
-        document: {
-          fileType: option.fileType,
-          key: option.key,
-          title: option.title,
-          permissions: {
-            comment: true,
-            download: true,
-            modifyContentControl: true,
-            modifyFilter: true,
-            print: true,
-            edit: true,
-            fillForms: true,
-            review: true
-          },
-          url: option.url
+        data() {
+            return {
+                doctype: '',
+                newId: '',
+                timer: '',
+                configKey: ''
+            }
+        },
+        mounted() {
+            // 调用初始化方法 ,渲染wps
+            if (this.option.url) {
+                this.setEditor(this.option)
+            }
         },
-        documentType: this.doctype,
-        editorConfig: {
-          callbackUrl: option.editUrl + '&access_token=' + getToken(),
-          lang: 'zh',
-          canHistoryRestore:true,
-          canUseHistory:true,
-          customization: {
-            commentAuthorOnly: false,
-            comments: true,
-            compactHeader:false,
-            compactToolbar:true,
-            feedback:false,
-            plugins:true,
-        "feedback": {
-          "visible": true // 隐藏反馈按钮
-               },
-			"forcesave": true, // true 表示强制文件保存请求添加到回调处理程序
-			"atuosave":false,//取消强制保存,进行手动保存
-          },
-          user:{
-            id:option.user.id,
-            name:option.user.name
-          },
-          mode:option.mode,
+        beforeDestroy() {
+            // 页面关闭清除定时任务
+            this.clearTimer()
         },
-        width: '100%',
-        token:getToken(),
-        height:  document.body.clientHeight+'px'
-      }
-      let docEditor = new DocsAPI.DocEditor('editorDiv', config)
-      this.configKey = config.document.key
-    },
-  },
-  watch: {
-    option: {
-      handler: function (n, o) {
-        this.setEditor(n)
-        this.doctype = handleDocType(n.fileType)
-      },
-      deep: true,
+        methods: {
+            // 清除定时任务
+            clearTimer() {
+                if (this.timer) {
+                    clearInterval(this.timer)
+                    this.timer = null
+                }
+            },
+            setEditor(option) {
+                this.doctype = handleDocType(option.fileType)
+                let config = {
+                    document: {
+                        fileType: option.fileType,
+                        key: option.key,
+                        title: option.title,
+                        permissions: {
+                            comment: true,
+                            download: true,
+                            modifyContentControl: true,
+                            modifyFilter: true,
+                            print: true,
+                            edit: true,
+                            fillForms: true,
+                            review: true
+                        },
+                        url: option.url
+                    },
+                    documentType: this.doctype,
+                    editorConfig: {
+                        callbackUrl: option.editUrl + '&access_token=' + getToken(),
+                        lang: 'zh',
+                        canHistoryRestore: true,
+                        canUseHistory: true,
+                        customization: {
+                            commentAuthorOnly: false,
+                            comments: true,
+                            compactHeader: false,
+                            compactToolbar: false,
+                            plugins: true,
+                            feedback: {
+                                visible: false // 隐藏反馈按钮
+                            },
+                            forcesave: true, // true 表示强制文件保存请求添加到回调处理程序
+                            atuosave: false // 取消强制保存,进行手动保存
+                        },
+                        user: {
+                            id: option.user.id,
+                            name: option.user.name
+                        },
+                        mode: option.mode
+                    },
+                    events: {
+                        onRequestSaveAs: () => {
+                            console.log('另存为')
+                        },
+                        onDocumentStateChange: e => {
+                            if (!e.data) {
+                                console.log('文件修改', e)
+                                this.handlerFileSave()
+                            }
+                        },
+                        onDocumentReady: () => {
+                            console.log('文件加载完成~')
+                        }
+                    },
+                    width: '100%',
+                    token: getToken(),
+                    height: document.body.clientHeight + 'px'
+                }
+                let docEditor = new DocsAPI.DocEditor('editorDiv', config)
+                this.configKey = config.document.key
+            },
+            handlerFileSave() {
+                this.clearTimer()
+                // 进行后端接口轮询,查到id则进行与当前id比较,相等则不做操作,不相等则返回id,更新页面数据。
+                this.timer = setInterval(() => {
+                    if (this.configKey) {
+                        showView({ key: this.configKey }).then((response) => {
+                            if (response.variables.data !== '0' && this.newId !== response.variables.data) {
+                                // 记录当前id,与返回的文件id比对,有变化证明有做修改,提示并替换
+                                this.newId = response.variables.data 
+                                this.$message.success('文件编辑保存成功,稍后请提交表单!')
+                                this.$emit('updateFile', this.newId)
+                                this.clearTimer()
+                            }
+                        })
+                    }
+                }, 2000)
+            }
+        },
+        watch: {
+            option: {
+                handler: function (n, o) {
+                    this.setEditor(n)
+                    this.doctype = handleDocType(n.fileType)
+                },
+                deep: true
+            }
+        }
     }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+</script>

+ 18 - 21
src/business/platform/file/attachment/editFile/editor/editor.js

@@ -1,22 +1,19 @@
 export function handleDocType(fileType) {
-  let docType = '';
-  let fileTypesDoc = [
-    'doc', 'docm', 'docx', 'dot', 'dotm', 'dotx', 'epub', 'fodt', 'htm', 'html', 'mht', 'odt', 'ott', 'pdf', 'rtf', 'txt', 'djvu', 'xps'
-  ];
-  let fileTypesCsv = [
-    'csv', 'fods', 'ods', 'ots', 'xls', 'xlsm', 'xlsx', 'xlt', 'xltm', 'xltx'
-  ];
-  let fileTypesPPt = [
-    'fodp', 'odp', 'otp', 'pot', 'potm', 'potx', 'pps', 'ppsm', 'ppsx', 'ppt', 'pptm', 'pptx'
-  ];
-  if (fileTypesDoc.includes(fileType)) {
-    docType = 'text'
-  }
-  if (fileTypesCsv.includes(fileType)) {
-    docType = 'spreadsheet'
-  }
-  if (fileTypesPPt.includes(fileType)) {
-    docType = 'presentation'
-  }
-  return docType;
-}
+    let docType = ''
+    let fileTypesDoc = [ 'doc', 'docm', 'docx', 'dot', 'dotm', 'dotx', 'epub', 'fodt', 'htm', 'html', 'mht', 'odt', 'ott', 'pdf', 'rtf', 'txt', 'djvu', 'xps']
+    let fileTypesCsv = [ 'csv', 'fods', 'ods', 'ots', 'xls', 'xlsm', 'xlsx', 'xlt', 'xltm', 'xltx' ]
+    let fileTypesPPt = [ 'fodp', 'odp', 'otp', 'pot', 'potm', 'potx', 'pps', 'ppsm', 'ppsx', 'ppt', 'pptm', 'pptx' ]
+    if (fileTypesDoc.includes(fileType)) {
+        // docType = 'text'
+        docType = 'word'
+    }
+    if (fileTypesCsv.includes(fileType)) {
+        // docType = 'spreadsheet'
+        docType = 'cell'
+    }
+    if (fileTypesPPt.includes(fileType)) {
+        // docType = 'presentation'
+        docType = 'slide'
+    }
+    return docType
+}

+ 48 - 51
src/business/platform/file/attachment/editFile/fView.vue

@@ -1,58 +1,55 @@
 <template>
-	<div>
-		<editor
-    :option="option"
-    @updateFile = "updateFile"
-    />
-	</div>
+    <div>
+        <editor :option="option" @updateFile="updateFile" />
+    </div>
 </template>
 
 <script>
-import editor from './editor'
-export default {
-  name: 'fView',
-  components: { editor },
- props: {
-   optionFile: {
-     type: Object,
-     default: () => {
-       return {}
-     }
-   }
- },
-  data() {
-    return {
-      option: {
-        url: '',
-        isEdit: true,
-        fileType: '',
-        title: '',
-        user: {
-          id: '',
-          name: ''
+    import editor from './editor'
+    export default {
+        name: 'fView',
+        components: { editor },
+        props: {
+            optionFile: {
+                type: Object,
+                default: () => {
+                    return {}
+                }
+            }
         },
-        mode: 'edit',
-        editUrl: '',
-        key: ''
-      },
-    }
-  },
-  /* 创时,同时创建定时任务,开始查询是否有对应key*/
-  created() {
-    this.option.user.id =this.$store.getters.userId
-    this.option.user.name = this.$store.getters.name
-    this.getFile()
-  },
-  methods: {
-    updateFile(data){
-         this.$emit('updateFile',data)
-      },
-    getFile() {
-				this.option.url =  this.optionFile.url //下载地址
-				this.option.editUrl = this.optionFile.editUrl //回调接口url
-				this.option.title =this.optionFile.title // 文件名称
-				this.option.fileType =this.optionFile.fileType //类型
+        data() {
+            return {
+                option: {
+                    url: '',
+                    isEdit: true,
+                    fileType: '',
+                    title: '',
+                    user: {
+                        id: '',
+                        name: ''
+                    },
+                    mode: 'edit',
+                    editUrl: '',
+                    key: ''
+                }
+            }
+        },
+        // 创建定时任务,开始查询是否有对应key
+        created() {
+            this.option.user.id = this.$store.getters.userId
+            this.option.user.name = this.$store.getters.name
+            this.getFile()
+        },
+        methods: {
+            updateFile(data) {
+                this.$emit('updateFile', data)
+            },
+            getFile() {
+                this.option.url = this.optionFile.url // 下载地址
+                this.option.editUrl = this.optionFile.editUrl // 回调接口url
+                this.option.title = this.optionFile.title // 文件名称
+                this.option.fileType = this.optionFile.fileType // 类型
+            }
+        }
     }
-  },
-}
 </script>

+ 597 - 590
src/business/platform/file/attachment/selector.vue

@@ -1,603 +1,610 @@
 <template>
-  <div>
-    <ibps-file-attachment-selector
-      ref="attachmentSelector"
-      :items="items"
-      :value="selectorValue"
-      :media-type="mediaType"
-      :media="media"
-      :placeholder="placeholder"
-      :multiple="multiple"
-      :limit="limit"
-      :disabled="disabled"
-      :readonly="readonly"
-      :download="download"
-      :operation_status = "operation_status"
-      :preview="preview"
-      :upload-type="uploadType"
-      :file-size="fileSize"
-      :accept="acceptType"
-      :file-ext="fileExt"
-      @action-event="handleActionEvent"
-    />
-    <!-- 选择器 -->
-    <ibps-uploader-selector-dialog
-      :visible="selectorVisible"
-      :value="selectorValue"
-      :multiple="selectorMultiple"
-      :file-size="fileSize"
-      :accept="acceptType"
-      :file-ext="fileExt"
-      :limit="limit"
-      @close="visible => selectorVisible = visible"
-      @action-event="handleSelectorActionEvent"
-    />
-    <div  v-if="filePreviewVisible">
-      <file-preview
-          :file="attachment"
-          :visible="filePreviewVisible"
-           :optionFile = "optionFileView"
-          @close="visible => filePreviewVisible = visible"
+    <div>
+        <ibps-file-attachment-selector
+            ref="attachmentSelector"
+            :items="items"
+            :value="selectorValue"
+            :media-type="mediaType"
+            :media="media"
+            :placeholder="placeholder"
+            :multiple="multiple"
+            :limit="limit"
+            :disabled="disabled"
+            :readonly="readonly"
+            :download="download"
+            :operation_status="operation_status"
+            :preview="preview"
+            :upload-type="uploadType"
+            :file-size="fileSize"
+            :accept="acceptType"
+            :file-ext="fileExt"
+            @action-event="handleActionEvent"
         />
-     </div>
+        <!-- 选择器 -->
+        <ibps-uploader-selector-dialog
+            :visible="selectorVisible"
+            :value="selectorValue"
+            :multiple="selectorMultiple"
+            :file-size="fileSize"
+            :accept="acceptType"
+            :file-ext="fileExt"
+            :limit="limit"
+            @close="visible => selectorVisible = visible"
+            @action-event="handleSelectorActionEvent"
+        />
+        <div v-if="filePreviewVisible">
+            <file-preview
+                :file="attachment"
+                :visible="filePreviewVisible"
+                :optionFile="optionFileView"
+                @close="visible => filePreviewVisible = visible"
+            />
+        </div>
 
-    <div class="divShow" v-if="showFile">
-      <fView
-       :optionFile = "optionFile"
-       @updateFile="updateFile"
-      />
+        <div class="divShow" v-if="showFile">
+            <fView :optionFile="optionFile" @updateFile="updateFile" />
+        </div>
     </div>
-  </div>
 </template>
 <script>
-import { get, transfer, uploadFile } from '@/api/platform/file/attachment'
-import { downloadFile } from '@/business/platform/file/utils'
-import { remoteRequest, remoteTransRequest } from '@/utils/remote'
-import IbpsFileAttachmentSelector from './index'
-import IbpsUploaderSelectorDialog from '@/business/platform/file/uploader'
-import FilePreview from '@/business/platform/file/file-preview'
-import { supportFileTypes } from '@/components/ibps-file-viewer/constants'
-import { TRANSFER_DATA } from '@/constant'
-import fView from './editFile/fView.vue'
-import {SYSTEM_URL,BASE_API} from '@/api/baseUrl'
-
-export default {
-  components: {
-    IbpsFileAttachmentSelector,
-    IbpsUploaderSelectorDialog,
-    FilePreview,
-    fView
-  },
-  inject: {
-    elForm: {
-      default: ''
-    },
-    elFormItem: {
-      default: ''
-    }
-  },
-  props: {
-    value: {
-      type: [String, Number, Array, Object]
-    },
-    mediaType: String,
-    media: String,
-    store: { // / 存储类型 ,json: json字符串,id:只存储id, array:存储数组数据 ,arrayId: 字符串类型。
-      type: String,
-      default: 'id',
-      validator: function(value) {
-        return ['json', 'id', 'array', 'arrayId', 'bind'].indexOf(value) !== -1
-      }
-    },
-    storeSeparator: { // 存储值分割符,对应[多选]有效,对于设置字符串类型的分隔符
-      type: String,
-      default: ','
-    },
-    placeholder: { // 输入框占位文本
-      type: String,
-      default: '请选择附件'
-    },
-    multiple: { // 是否多选
-      type: Boolean,
-      default: false
-    },
-    limit: { // 最大允许上传个数
-      type: Number
-    },
-    accept: String, // 类型,
-    fileExt: {
-      type: Array,
-      default: () => []
-    },
-    disabled: { // 禁用
-      type: Boolean,
-      default: false
-    },
-    readonly: { // 只读
-      type: Boolean,
-      default: false
-    },
-    operation_status:{ //编辑
-      type: String,
-      default: 'none'
-    },
-    download: { // 允许下载
-      type: Boolean,
-      default: true
-    },
-    preview: { // 允许预览
-      type: Boolean,
-      default: true
-    },
-    fileSize: { // 上传尺寸
-      type: Number
-    },
-    labelKey: {
-      type: String,
-      default: 'fileName'
-    },
-    valueKey: {
-      type: String,
-      default: 'id'
-    },
-    uploadType: { // 上传方式 ( default:直接打开上传,attachment:ibps上传附件打开上传 )
-      type: String,
-      default: 'attachment'
-    },
-    showExtName: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      selectorVisible: false,
-      selectorValue: this.multiple ? [] : {},
-      reselect: false, // 重新选择
-      selectorMultiple: this.multiple,
-      index: -1,
-      cacheData: {},
-      attachment: {},
-      filePreviewVisible: false,
-      acceptType: '',
-      showFile:false,
-      file:'',
-      optionFile:{},
-      optionFileView:{},
-    }
-  },
-  computed: {
-    items() {
-      if (this.$utils.isEmpty(this.selectorValue)) return []
-      if (this.multiple) {
-        return this.selectorValue.map(data => {
-          return data[this.labelKey] + this.getExtName(data)
-        })
-      } else {
-        return [this.selectorValue[this.labelKey] + this.getExtName(this.selectorValue)]
-      }
-    },
-    uploadStyle() {
-      const { width, height } = this
-      return {
-        'width': `${width}px`,
-        'height': `${height}px`,
-        'lineHeight': `${height}px`,
-        'display': 'inline'
-      }
-    }
-  },
-  watch: {
-    value(val) {
-      if (this.$utils.isEmpty(this.value)) {
-        this.selectorValue = []
-      } else if(val){
-        this.initData()
-      }
-    },
-    mediaType: {
-      handler: function(val, oldVal) {
-        if (val === 'custom') {
-          var arr = this.media.split(',')
-          const accept = '.' + arr.join(',').replace(/,/g, ',.')
-          this.acceptType = accept
-        } else {
-          this.acceptType = this.accept
-        }
-      },
-      immediate: true
-    }
-  },
-  mounted() {
-    this.initData()
-  },
-  methods: {
-   //替换对应的文件 id  this.optionFile.data.index  为点击编辑时记录的下表号
-    updateFile(data){
-      this.selectorValue[this.optionFile.data.index ].id =  data
-       this.handleInput()
-      },
-    /**
-     * 初始化数据
-     */
-    initData() {
-      const data = this.getArrayValue(this.value)
-      this.selectorValue = this.multiple ? [] : {}
-      if (this.$utils.isEmpty(data)) {
-        return
-      }
-      data.forEach(v => {
-        if (this.cacheData[v]) {
-          this.setSelectorValue(v)
-        } else {
-          this.getDataInfo(v)
-        }
-      })
-    },
-    setCacheData() {
-      if (this.$utils.isEmpty(this.selectorValue)) return
-      const data = this.multiple ? this.selectorValue : [this.selectorValue]
-      data.forEach(v => {
-        this.cacheData[v[this.valueKey]] = v
-      })
-    },
-    setSelectorValue(v) {
-      if (this.multiple) {
-        this.selectorValue.push(this.cacheData[v])
-      } else {
-        this.selectorValue = JSON.parse(JSON.stringify(this.cacheData[v]))
-      }
-    },
-    /**
-     * 获得数组数据
-     */
-    getArrayValue(value, bindId) {
-      if (this.$utils.isEmpty(value)) {
-        return []
-      }
-      if (this.store === 'json') { // json
-        return this.parseJsonData(value)
-      } else if (this.store === 'id') { // id
-        // 可能是json数据[之前存储的josn格式]
-        if (this.$utils.isJSON(value)) {
-          return this.parseJsonData(value)
-        } else {
-          return this.$utils.isString(value) ? value.split(this.storeSeparator) : []
-        }
-      } else if (this.store === 'bind') { // 绑定id
-        if (this.$utils.isEmpty(bindId)) {
-          return []
-        }
-        return bindId.split(this.storeSeparator)
-      } else { // array
-        return value.map((d) => {
-          return d[this.valueKey]
-        })
-      }
-    },
-    parseJsonData(value) {
-      try {
-        const data = this.$utils.parseData(value)
-        const result = []
-        if (Array.isArray(data)) {
-          data.forEach(d => {
-            const node = d[this.valueKey]
-            if (node) result.push(node)
-          })
-        } else {
-          if (this.$utils.isPlainObject(data)) {
-            result.push(data[this.valueKey])
-          } else {
-            const realData = this.$utils.isString(value) ? value.split(this.storeSeparator) : []
-            realData.forEach(v => {
-              result.push(v)
-            })
-          }
-        }
-        return result
-      } catch (error) {
-        console.warn(error)
-        return []
-      }
-    },
-    getStoreValue(value) {
-      const res = []
-      if (this.store === 'json') { // json
-        if (this.$utils.isEmpty(value)) {
-          return ''
-        }
-        if (this.multiple) {
-          value.forEach(v => {
-            const o = {}
-            o[this.valueKey] = v[this.valueKey]
-            o[this.labelKey] = v[this.labelKey]
-            res.push(o)
-          })
-          return JSON.stringify(res)
-        } else {
-          const o = {}
-          o[this.valueKey] = value[this.valueKey]
-          o[this.labelKey] = value[this.labelKey]
-          return JSON.stringify(o)
-        }
-      } else if (this.store === 'id') { // id
-        if (this.$utils.isEmpty(value)) {
-          return ''
-        }
-        if (this.multiple) {
-          value.forEach(v => {
-            res.push(v[this.valueKey])
-          })
-        } else {
-          res.push(value[this.valueKey])
-        }
-        return res.join(this.storeSeparator)
-      } else if (this.store === 'bind') { // 绑定id
-        const res = []
-        const bindIdValue = []
-        value.forEach(v => {
-          bindIdValue.push(v[this.valueKey])
-          res.push(v[this.labelKey])
-        })
-        this.bindIdValue = bindIdValue.join(this.storeSeparator)
-
-        return res.join(this.storeSeparator)
-      } else { // 数组 array
-        return value || []
-      }
-    },
-    /**
-    * 通过ID获取数据
-     */
-    getDataInfo(id) {
-      if (TRANSFER_DATA === 'transfer') {
-        this.getTransferData(id)
-      } else {
-        this.getRemoteData(id)
-      }
-    },
-    getTransferData(id) {
-      remoteTransRequest('attachment', id).then(idset => {
-        const ids = Array.from(idset)
-        remoteRequest('attachmentIds', ids, () => {
-          return this.getRemoteTransFunc(ids)
-        }).then(response => {
-          const responseData = response.data
-          const data = responseData[id]
-          this.setRemoteData(data)
-        }).catch(() => {
-        })
-      })
-    },
-    getRemoteTransFunc(ids) {
-      return new Promise((resolve, reject) => {
-        transfer({
-          'ids': ids
-        }).then(response => {
-          resolve(response)
-        }).catch((error) => {
-          reject(error)
-        })
-      })
-    },
-
-    getRemoteData(id) {
-      remoteRequest('attachment' + this.valueKey, id, () => {
-        return this.getRemoteByIdFunc(id)
-      }).then(response => {
-        const data = response.data
-        this.setRemoteData(data)
-      }).catch(() => {
-      })
-    },
-    getRemoteByIdFunc(id) {
-      return new Promise((resolve, reject) => {
-        get({
-          attachmentId: id
-        }).then(response => {
-          resolve(response)
-        }).catch(() => {
-        })
-      })
-    },
-    setRemoteData(data) {
-      if (this.$utils.isNotEmpty(data)) {
-        this.cacheData[data[this.valueKey]] = data
-        this.setSelectorValue(data[this.valueKey])
-      }
-    },
-
-    getExtName(data) {
-      if (!data) { return '' }
-      if (this.showExtName && data['ext']) {
-        return '.' + data['ext']
-      }
-      return ''
-    },
-    // ===================事件处理=========
+    import { get, transfer, uploadFile } from '@/api/platform/file/attachment'
+    import { downloadFile } from '@/business/platform/file/utils'
+    import { remoteRequest, remoteTransRequest } from '@/utils/remote'
+    import IbpsFileAttachmentSelector from './index'
+    import IbpsUploaderSelectorDialog from '@/business/platform/file/uploader'
+    import FilePreview from '@/business/platform/file/file-preview'
+    import { supportFileTypes } from '@/components/ibps-file-viewer/constants'
+    import { TRANSFER_DATA } from '@/constant'
+    import fView from './editFile/fView.vue'
+    import { SYSTEM_URL, BASE_API } from '@/api/baseUrl'
 
-    handleActionEvent(action, index,data,type) {
-      this.index = index
-      switch (action) {
-        case 'select': // 选择
-          this.selectorVisible = true
-          this.selectorMultiple = this.multiple
-          this.reselect = false
-          this.showFile = false
-          break
-        case 'reselect':// 重新选择
-          this.selectorVisible = true
-          this.selectorMultiple = false
-          this.reselect = true
-          this.showFile = false
-          break
-        case 'remove' :// 删除
-          this.handleRemove(index)
-          this.$refs['attachmentSelector'].init()
-          break
-        case 'download' :// 下载
-          this.handleDownload(index)
-          break
-        case 'preview' : // 预览
-          this.handlePreview(index)
-          break
-        case 'confirm' : // 默认上传选择文件
-          this.handleSelectorActionEvent(action, index)
-          break
-        case 'edit' : //编辑
-          this.handleEdit(index,data,type)
-          break
-
-      }
-    },
-    /* 处理编辑文件*/
-    handleEdit(index,data,type){
-     //1、获取文件数据 及下载流接口
-      this.optionFile.url = BASE_API() + SYSTEM_URL() + '/file/download?attachmentId=' + data.id
-      this.optionFile.editUrl =  BASE_API()+SYSTEM_URL() + '/file/editCallback?fileName=' + data.fileName+'&fileType='+data.ext+'&type='+type+'&id='+ data.id
-      this.optionFile.title =data.fileName // 文件名称
-      this.optionFile.fileType = data.ext //类型
-      this.optionFile.data = data //记录编制的位置, 需要替换。
-      this.optionFile.data.index = index
-      //2、显示编辑位置,提交后进行保存
-      if(this.showFile){ //重复打开,进行刷新子组件
-          this.showFile = false
-        }else{
-           this.showFile = true
-         /*  this.timer = setInterval((num)=>{
-           this. test = true
-           },10000) */
-        }
-    },
-    /**
-     * 处理删除
-     */
-    handleRemove(index) {
-      if (this.multiple) {
-        this.selectorValue.splice(index, 1)
-      } else {
-        this.selectorValue = {} //当前为清空
-      }
-      this.handleInput()
-    },
-    /**
-     * 处理下载
-     */
-    handleDownload(index) {
-      downloadFile(this.multiple ? this.selectorValue[index] : this.selectorValue)
-    },
-    /**
-     * 处理预览
-     */
-   handlePreview(index) {
-      this.attachment = this.multiple ? this.selectorValue[index] : this.selectorValue
-      if (supportFileTypes.includes(this.attachment.ext)) {
-        this.getPreview(index)
-      } else {
-        this.$message.closeAll()
-        this.$message({
-          message: `暂不支持该文件类型预览`,
-          type: 'warning'
-        })
-      }
-    },
-    /**
-     * 处理预览
-     */
-    getPreview(index) {
-           //1、获取文件数据 及下载流接口
-            this.optionFileView.url =  BASE_API() + SYSTEM_URL()  + '/file/download?attachmentId=' + this.attachment.id //下载地址
-            this.optionFileView.editUrl =BASE_API() +SYSTEM_URL()+ '/file/editCallback?fileName=' + this.attachment.fileName+'&fileType=' + this.attachment.ext //回调接口url
-            this.optionFileView.title =this.attachment.fileName// 文件名称
-            this.optionFileView.fileType = this.attachment.ext //类型
-            this.optionFileView.data = this.attachment //记录编制的位置, 需要替换。
-            this.optionFileView.data.index = index
-            this.filePreviewVisible = true
-       },
-    /**
-     *  确定
-     */
-    handleSelectorActionEvent(buttonKey, data) {
-      if (this.uploadType === 'default' && this.$utils.isNotEmpty(this.limit) && this.multiple && this.limit < data.length) {
-        this.$message({
-          type: 'warning'
-        })
-        this.$refs['attachmentSelector'].init()
-        return
-      }
-      switch (buttonKey) {
-        case 'confirm':// 确定
-          this.selectorVisible = false
-          if (this.reselect) {
-            if (this.multiple) {
-              this.selectorValue.splice(this.index, 1, data)
-            } else {
-              this.selectorValue = data
+    export default {
+        components: {
+            IbpsFileAttachmentSelector,
+            IbpsUploaderSelectorDialog,
+            FilePreview,
+            fView
+        },
+        inject: {
+            elForm: {
+                default: ''
+            },
+            elFormItem: {
+                default: ''
             }
-          } else {
-            this.selectorValue = data
-          }
-          this.setCacheData()
-          this.handleInput()
-          break
-      }
-    },
-
-    handleInput() {
-      this.$emit('input', this.getStoreValue(this.selectorValue))
-      // 提供一个返回实体,提供调用
-      this.$emit('callback', this.selectorValue)
-    },
+        },
+        props: {
+            value: {
+                type: [String, Number, Array, Object]
+            },
+            mediaType: String,
+            media: String,
+            store: {
+                // 存储类型,json: json字符串,id: 只存储id,array: 存储数组数据,arrayId: 字符串类型。
+                type: String,
+                default: 'id',
+                validator: function (value) {
+                    return (['json', 'id', 'array', 'arrayId', 'bind'].indexOf(value) !== -1)
+                }
+            },
+            storeSeparator: {
+                // 存储值分割符,对应[多选]有效,对于设置字符串类型的分隔符
+                type: String,
+                default: ','
+            },
+            placeholder: {
+                // 输入框占位文本
+                type: String,
+                default: '请选择附件'
+            },
+            multiple: {
+                // 是否多选
+                type: Boolean,
+                default: false
+            },
+            limit: {
+                // 最大允许上传个数
+                type: Number
+            },
+            // 类型,
+            accept: String,
+            fileExt: {
+                type: Array,
+                default: () => []
+            },
+            disabled: {
+                // 禁用
+                type: Boolean,
+                default: false
+            },
+            readonly: {
+                // 只读
+                type: Boolean,
+                default: false
+            },
+            operation_status: {
+                //编辑
+                type: String,
+                default: 'none'
+            },
+            download: {
+                // 允许下载
+                type: Boolean,
+                default: true
+            },
+            preview: {
+                // 允许预览
+                type: Boolean,
+                default: true
+            },
+            fileSize: {
+                // 上传尺寸
+                type: Number
+            },
+            labelKey: {
+                type: String,
+                default: 'fileName'
+            },
+            valueKey: {
+                type: String,
+                default: 'id'
+            },
+            uploadType: {
+                // 上传方式 ( default:直接打开上传,attachment:ibps上传附件打开上传 )
+                type: String,
+                default: 'attachment'
+            },
+            showExtName: {
+                type: Boolean,
+                default: true
+            }
+        },
+        data() {
+            return {
+                selectorVisible: false,
+                selectorValue: this.multiple ? [] : {},
+                reselect: false, // 重新选择
+                selectorMultiple: this.multiple,
+                index: -1,
+                cacheData: {},
+                attachment: {},
+                filePreviewVisible: false,
+                acceptType: '',
+                showFile: false,
+                file: '',
+                optionFile: {},
+                optionFileView: {}
+            }
+        },
+        computed: {
+            items() {
+                if (this.$utils.isEmpty(this.selectorValue)) return []
+                if (this.multiple) {
+                    return this.selectorValue.map(data => {
+                        return data[this.labelKey] + this.getExtName(data)
+                    })
+                } else {
+                    return [ this.selectorValue[this.labelKey] + this.getExtName(this.selectorValue) ]
+                }
+            },
+            uploadStyle() {
+                const { width, height } = this
+                return {
+                    width: `${width}px`,
+                    height: `${height}px`,
+                    lineHeight: `${height}px`,
+                    display: 'inline'
+                }
+            }
+        },
+        watch: {
+            value(val) {
+                if (this.$utils.isEmpty(this.value)) {
+                    this.selectorValue = []
+                } else if (val) {
+                    this.initData()
+                }
+            },
+            mediaType: {
+                handler: function (val, oldVal) {
+                    if (val === 'custom') {
+                        var arr = this.media.split(',')
+                        const accept = '.' + arr.join(',').replace(/,/g, ',.')
+                        this.acceptType = accept
+                    } else {
+                        this.acceptType = this.accept
+                    }
+                },
+                immediate: true
+            }
+        },
+        mounted() {
+            this.initData()
+        },
+        methods: {
+            // 替换对应的文件 id  this.optionFile.data.index  为点击编辑时记录的下表号
+            updateFile(data) {
+                if (this.multiple) {
+                    this.selectorValue[this.optionFile.data.index].id = data
+                } else {
+                    this.selectorValue.id = data
+                }
+                this.handleInput()
+            },
+            /**
+             * 初始化数据
+             */
+            initData() {
+                const data = this.getArrayValue(this.value)
+                this.selectorValue = this.multiple ? [] : {}
+                if (this.$utils.isEmpty(data)) {
+                    return
+                }
+                data.forEach(v => {
+                    if (this.cacheData[v]) {
+                        this.setSelectorValue(v)
+                    } else {
+                        this.getDataInfo(v)
+                    }
+                })
+            },
+            setCacheData() {
+                if (this.$utils.isEmpty(this.selectorValue)) return
+                const data = this.multiple ? this.selectorValue : [this.selectorValue]
+                data.forEach(v => {
+                    this.cacheData[v[this.valueKey]] = v
+                })
+            },
+            setSelectorValue(v) {
+                if (this.multiple) {
+                    this.selectorValue.push(this.cacheData[v])
+                } else {
+                    this.selectorValue = JSON.parse(JSON.stringify(this.cacheData[v]))
+                }
+            },
+            /**
+             * 获得数组数据
+             */
+            getArrayValue(value, bindId) {
+                if (this.$utils.isEmpty(value)) {
+                    return []
+                }
+                if (this.store === 'json') {
+                    // json
+                    return this.parseJsonData(value)
+                } else if (this.store === 'id') {
+                    // id
+                    // 可能是json数据[之前存储的josn格式]
+                    if (this.$utils.isJSON(value)) {
+                        return this.parseJsonData(value)
+                    } else {
+                        return this.$utils.isString(value) ? value.split(this.storeSeparator) : []
+                    }
+                } else if (this.store === 'bind') {
+                    // 绑定id
+                    if (this.$utils.isEmpty(bindId)) {
+                        return []
+                    }
+                    return bindId.split(this.storeSeparator)
+                } else {
+                    // array
+                    return value.map(d => {
+                        return d[this.valueKey]
+                    })
+                }
+            },
+            parseJsonData(value) {
+                try {
+                    const data = this.$utils.parseData(value)
+                    const result = []
+                    if (Array.isArray(data)) {
+                        data.forEach(d => {
+                            const node = d[this.valueKey]
+                            if (node) result.push(node)
+                        })
+                    } else {
+                        if (this.$utils.isPlainObject(data)) {
+                            result.push(data[this.valueKey])
+                        } else {
+                            const realData = this.$utils.isString(value) ? value.split(this.storeSeparator) : []
+                            realData.forEach(v => { result.push(v) })
+                        }
+                    }
+                    return result
+                } catch (error) {
+                    console.warn(error)
+                    return []
+                }
+            },
+            getStoreValue(value) {
+                const res = []
+                if (this.store === 'json') {
+                    // json
+                    if (this.$utils.isEmpty(value)) {
+                        return ''
+                    }
+                    if (this.multiple) {
+                        value.forEach(v => {
+                            const o = {}
+                            o[this.valueKey] = v[this.valueKey]
+                            o[this.labelKey] = v[this.labelKey]
+                            res.push(o)
+                        })
+                        return JSON.stringify(res)
+                    } else {
+                        const o = {}
+                        o[this.valueKey] = value[this.valueKey]
+                        o[this.labelKey] = value[this.labelKey]
+                        return JSON.stringify(o)
+                    }
+                } else if (this.store === 'id') {
+                    if (this.$utils.isEmpty(value)) {
+                        return ''
+                    }
+                    if (this.multiple) {
+                        value.forEach(v => {
+                            res.push(v[this.valueKey])
+                        })
+                    } else {
+                        res.push(value[this.valueKey])
+                    }
+                    return res.join(this.storeSeparator)
+                } else if (this.store === 'bind') {
+                    // 绑定id
+                    const res = []
+                    const bindIdValue = []
+                    value.forEach(v => {
+                        bindIdValue.push(v[this.valueKey])
+                        res.push(v[this.labelKey])
+                    })
+                    this.bindIdValue = bindIdValue.join(this.storeSeparator)
 
-    /**
-     * 文件上传
-     */
-    httpRequest(options) {
-      return uploadFile(options.file, {})
-    },
-    handleDelete(file, selectorValue) {
-      this.selectorValue = selectorValue
-    },
-    handleSuccess(response, file, selectorValue) {
-      this.selectorValue = selectorValue.map(item => {
-        item.isActive = false
-        return item
-      })
-    },
-    handleChange(file, selectorValue) {
-      this.selectorValue = selectorValue
-    },
-    // 图片上传数量限制
-    handlePicAmount(files, selectorValue) {
-      if (this.multiple && this.limit) {
-        this.$message.closeAll()
-        this.$message({
-          message: `图片上传上限${this.limit}张`,
-          type: 'warning'
-        })
-      }
-    },
-    // 格式、大小限制
-    beforeUpload(file) {
-      const isType = this.accept ? file.type.includes(this.accept) : true
-      if (!isType) {
-        this.$message.closeAll()
-        this.$message.error(`上传图片的格式为${this.accept}`)
-      }
-      const isLimitSize = this.size ? (file.size / 1024 / 1024 < this.size) : true
-      if (!isLimitSize) {
-        this.$message.closeAll()
-        this.$message.error(`上传图片的大小不能超过 ${this.size}M!`)
-      }
-      return isLimitSize && isType
+                    return res.join(this.storeSeparator)
+                } else {
+                    // 数组 array
+                    return value || []
+                }
+            },
+            /**
+             * 通过ID获取数据
+             */
+            getDataInfo(id) {
+                if (TRANSFER_DATA === 'transfer') {
+                    this.getTransferData(id)
+                } else {
+                    this.getRemoteData(id)
+                }
+            },
+            getTransferData(id) {
+                remoteTransRequest('attachment', id).then(idset => {
+                    const ids = Array.from(idset)
+                    remoteRequest('attachmentIds', ids, () => {
+                        return this.getRemoteTransFunc(ids)
+                    }).then(response => {
+                        const responseData = response.data
+                        const data = responseData[id]
+                        this.setRemoteData(data)
+                    }).catch(() => {})
+                })
+            },
+            getRemoteTransFunc(ids) {
+                return new Promise((resolve, reject) => {
+                    transfer({ ids: ids }).then(response => {
+                        resolve(response)
+                    }).catch((error) => {
+                        reject(error)
+                    })
+                })
+            },
+            getRemoteData(id) {
+                remoteRequest('attachment' + this.valueKey, id, () => {
+                    return this.getRemoteByIdFunc(id)
+                }).then(response => {
+                    const data = response.data
+                    this.setRemoteData(data)
+                }).catch(() => {})
+            },
+            getRemoteByIdFunc(id) {
+                return new Promise((resolve, reject) => {
+                    get({ attachmentId: id }).then(response => {
+                        resolve(response)
+                    }).catch(() => {})
+                })
+            },
+            setRemoteData(data) {
+                if (this.$utils.isNotEmpty(data)) {
+                    this.cacheData[data[this.valueKey]] = data
+                    this.setSelectorValue(data[this.valueKey])
+                }
+            },
+            getExtName(data) {
+                if (!data) {
+                    return ''
+                }
+                if (this.showExtName && data['ext']) {
+                    return '.' + data['ext']
+                }
+                return ''
+            },
+            // 事件处理
+            handleActionEvent(action, index, data, type) {
+                this.index = index
+                switch (action) {
+                    case 'select': // 选择
+                        this.selectorVisible = true
+                        this.selectorMultiple = this.multiple
+                        this.reselect = false
+                        this.showFile = false
+                        break
+                    case 'reselect': // 重新选择
+                        this.selectorVisible = true
+                        this.selectorMultiple = false
+                        this.reselect = true
+                        this.showFile = false
+                        break
+                    case 'remove': // 删除
+                        this.handleRemove(index)
+                        this.$refs['attachmentSelector'].init()
+                        break
+                    case 'download': // 下载
+                        this.handleDownload(index)
+                        break
+                    case 'preview': // 预览
+                        this.handlePreview(index)
+                        break
+                    case 'confirm': // 默认上传选择文件
+                        this.handleSelectorActionEvent(action, index)
+                        break
+                    case 'edit': // 编辑
+                        this.handleEdit(index, data, type)
+                        break
+                }
+            },
+            // 处理编辑文件
+            handleEdit(index, data, type) {
+                //1、获取文件数据 及下载流接口
+                this.optionFile.url = BASE_API() + SYSTEM_URL() + '/file/download?attachmentId=' + data.id
+                this.optionFile.editUrl = BASE_API() + SYSTEM_URL() + '/file/editCallback?fileName=' + data.fileName + '&fileType=' + data.ext + '&type=' + type + '&id=' + data.id
+                this.optionFile.title = data.fileName // 文件名称
+                this.optionFile.fileType = data.ext // 类型
+                this.optionFile.data = data //记录编制的位置,需要替换。
+                this.optionFile.data.index = index
+                //2、显示编辑位置,提交后进行保存
+                if (this.showFile) {
+                    //重复打开,进行刷新子组件
+                    this.showFile = false
+                } else {
+                    this.showFile = true
+                    // this.timer = setInterval((num)=>{
+                    //     this. test = true
+                    // },10000)
+                }
+            },
+            /**
+             * 处理删除
+             */
+            handleRemove(index) {
+                if (this.multiple) {
+                    this.selectorValue.splice(index, 1)
+                } else {
+                    this.selectorValue = {} //当前为清空
+                }
+                this.handleInput()
+            },
+            /**
+             * 处理下载
+             */
+            handleDownload(index) {
+                downloadFile(this.multiple ? this.selectorValue[index] : this.selectorValue)
+            },
+            /**
+             * 处理预览
+             */
+            handlePreview(index) {
+                this.attachment = this.multiple ? this.selectorValue[index] : this.selectorValue
+                if (supportFileTypes.includes(this.attachment.ext)) {
+                    this.getPreview(index)
+                } else {
+                    this.$message.closeAll()
+                    this.$message.warning('暂不支持该文件类型预览')
+                }
+            },
+            /**
+             * 处理预览
+             */
+            getPreview(index) {
+                //1、获取文件数据 及下载流接口
+                //下载地址
+                this.optionFileView.url = BASE_API() + SYSTEM_URL() + '/file/download?attachmentId=' + this.attachment.id
+                // 回调接口url
+                this.optionFileView.editUrl = BASE_API() + SYSTEM_URL() + '/file/editCallback?fileName=' + this.attachment.fileName + '&fileType=' + this.attachment.ext
+                this.optionFileView.title = this.attachment.fileName // 文件名称
+                this.optionFileView.fileType = this.attachment.ext // 类型
+                this.optionFileView.data = this.attachment // 记录编制的位置,需要替换。
+                this.optionFileView.data.index = index
+                this.filePreviewVisible = true
+            },
+            /**
+             *  确定
+             */
+            handleSelectorActionEvent(buttonKey, data) {
+                if (this.uploadType === 'default' && this.$utils.isNotEmpty(this.limit) && this.multiple && this.limit < data.length) {
+                    this.$message({
+                        type: 'warning'
+                    })
+                    this.$refs['attachmentSelector'].init()
+                    return
+                }
+                switch (buttonKey) {
+                    case 'confirm': // 确定
+                        this.selectorVisible = false
+                        if (this.reselect) {
+                            if (this.multiple) {
+                                this.selectorValue.splice(this.index, 1, data)
+                            } else {
+                                this.selectorValue = data
+                            }
+                        } else {
+                            this.selectorValue = data
+                        }
+                        this.setCacheData()
+                        this.handleInput()
+                        break
+                }
+            },
+            handleInput() {
+                this.$emit('input', this.getStoreValue(this.selectorValue))
+                // 提供一个返回实体,提供调用
+                this.$emit('callback', this.selectorValue)
+            },
+            /**
+             * 文件上传
+             */
+            httpRequest(options) {
+                return uploadFile(options.file, {})
+            },
+            handleDelete(file, selectorValue) {
+                this.selectorValue = selectorValue
+            },
+            handleSuccess(response, file, selectorValue) {
+                this.selectorValue = selectorValue.map(item => {
+                    item.isActive = false
+                    return item
+                })
+            },
+            handleChange(file, selectorValue) {
+                this.selectorValue = selectorValue
+            },
+            // 图片上传数量限制
+            handlePicAmount(files, selectorValue) {
+                if (this.multiple && this.limit) {
+                    this.$message.closeAll()
+                    this.$message({
+                        message: `图片上传上限${this.limit}张`,
+                        type: 'warning'
+                    })
+                }
+            },
+            // 格式、大小限制
+            beforeUpload(file) {
+                const isType = this.accept ? file.type.includes(this.accept) : true
+                if (!isType) {
+                    this.$message.closeAll()
+                    this.$message.error(`上传图片的格式为${this.accept}`)
+                }
+                const isLimitSize = this.size ? (file.size / 1024 / 1024 < this.size) : true
+                if (!isLimitSize) {
+                    this.$message.closeAll()
+                    this.$message.error(`上传图片的大小不能超过 ${this.size}M!`)
+                }
+                return isLimitSize && isType
+            }
+        }
     }
-  }
-}
 </script>
 <style scoped>
-  .divShow{
-    width: 100%;
-    height: calc(100vh);
-  }
-
+    .divShow {
+        width: 100%;
+        height: calc(100vh);
+    }
 </style>

+ 17 - 4
src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -45,10 +45,12 @@
                                 </el-dropdown>
                                 <template v-else>
                                     <template v-for="(button, index) in manageButtons">
-                                        <el-button plain size="mini" :key="index" :type="button.type" @click="handleActionEvent(button, scope.$index)">
+                                        <el-link :icon="button.icon" :key="index" :type="button.type" :underline="false" @click="handleActionEvent(button, scope.$index)">{{ button.label }}</el-link>
+                                        <!-- <el-button plain size="mini" :key="index" :type="button.type" @click="handleActionEvent(button, scope.$index)">
                                             {{ button.label }}
-                                        </el-button>
-                                        <el-divider v-if="(manageButtons.length === 3 && index === 0) || index === 1" :key="index" direction="vertical" />
+                                        </el-button> -->
+                                        <!-- (manageButtons.length === 3 && index === 0) || index === 1 -->
+                                        <el-divider v-if="index !== manageButtons.length - 1" :key="index" direction="vertical" />
                                     </template>
                                 </template>
                             </template>
@@ -634,6 +636,18 @@ export default {
                 ActionUtils.success('导入成功')
             })
         },
+        //数据导出
+        getIbpsExport(columns, data, title, message, nameKey = 'name') {
+            IbpsExport.excel({
+                columns: columns,
+                data: data,
+                nameKey: nameKey,
+                title: title
+            }).then(() => {
+                const msg = message ? message : '导出成功'
+                ActionUtils.success(msg)
+            })
+        },
         // 导出
         handleExport(button, index) {
             const position = button.position
@@ -668,7 +682,6 @@ export default {
                 : exportData
             // TODO: 需要格式化展示的数据
             this.convertExportData(data, columnMap).then((data) => {
-                console.log(columns, data)
                 IbpsExport.excel({
                     columns: columns,
                     data: data,

+ 34 - 3
src/components/ibps-crud/index.vue

@@ -193,7 +193,7 @@
                 </span>
                 <!--通用过滤器-->
                 <span v-else-if="column.filter" class="ibps-table-column">
-                  {{ handleColumnFilter(column.filter,scope.row[column.prop]) }}
+                  {{ handleColumnFilter(column.filter,scope.row[column.prop]) }}as
                 </span>
                 <!-- 下拉组件-->
                 <span v-else-if="column.options" class="ibps-table-column">
@@ -247,7 +247,7 @@
 
                 <!-- 自定义slot组件############################################-->
                <span v-else-if="column.slotName" class="ibps-table-column">
-                  <slot  :name="column.slotName" :row="scope.row" :value="scope.row[column.prop]" :column="column" :$index="scope.$index" />
+                 <slot  :name="column.slotName" :row="scope.row" :value="scope.row[column.prop]" :column="column" :$index="scope.$index" />
                 </span>
 
                 <!--自定义组件-->
@@ -482,7 +482,7 @@ export default {
   ]
 }
 </script>
-<style>
+<style >
   .el-table th{
     background-color: #A7D6F8 !important;
     font-size: 12px  !important;
@@ -514,4 +514,35 @@ export default {
       background: #F9FFFF;
       color: #000000;
     }
+
 </style>
+<style lang="less" scoped>
+    /deep/ .el-tag--mini{
+     height: 0px; 
+     padding: 0px; 
+     line-height: 15px; 
+    }
+    /deep/  .el-tag{
+    background-color: #ecf5ff;
+    border-color: #d9ecff;
+     height: 0px; 
+     padding: 0px; 
+    line-height: 15px; 
+    font-size: 12px;
+    color: #409EFF;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    //  white-space: nowrap;
+    white-space:break-spaces;
+    }
+    /deep/.cell{
+      overflow: visible;
+    }
+    /deep/ .el-table .cell.el-tooltip {
+     white-space:break-spaces; 
+    // min-width: 50px;
+    }
+</style>

+ 187 - 191
src/components/ibps-file-viewer/index.vue

@@ -1,202 +1,198 @@
 <template>
-  <div>
-    <image-viewer
-      v-if="fileType==='image'"
-      :z-index="zIndex"
-      :url-list="[url]"
-      :on-close="closeDialog"
-    />
-    <!--  <template v-if="fileType!=='image' && fileType">
-    <el-dialog
-        :visible.sync="dialogVisible"
-        :title="title"
-        fullscreen
-        append-to-body
-        custom-class="ibps-file-preview-dialog"
-        @close="closeDialog">
-      <editor :option="option"  v-if="dialogVisible"/> -->
-      <!--  <pdf-viewer
-          v-if="fileType==='pdf'"
-          ref="viewer"
+    <div>
+        <image-viewer
+            v-if="fileType === 'image'"
+            :z-index="zIndex"
+            :url-list="[url]"
+            :on-close="closeDialog"
         />
+        <!-- <template v-if="fileType !== 'image' && fileType">
+            <el-dialog
+                :visible.sync="dialogVisible"
+                :title="title"
+                fullscreen
+                append-to-body
+                custom-class="ibps-file-preview-dialog"
+                @close="closeDialog"
+            >
+                <editor :option="option" v-if="dialogVisible" />
+                <pdf-viewer v-if="fileType === 'pdf'" ref="viewer" />
 
-        <txt-viewer
-          v-else-if="fileType==='txt'"
-          class="file-type-txt"
-          :src="url"
-        />
-        <div v-else class="lc-fixed-navbar">不支持预览的类型</div>
-      </el-dialog>
-    </template>-->
-  </div>
+                <txt-viewer
+                    v-else-if="fileType === 'txt'"
+                    class="file-type-txt"
+                    :src="url"
+                />
+                <div v-else class="lc-fixed-navbar">不支持预览的类型</div>
+            </el-dialog>
+        </template> -->
+    </div>
 </template>
 <script>
-
-/**
-      * 文件预览
-      * 1、'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'  类型支持
-      * 2、图片支持缩放
-      * 3、音频,语音支持
-      * ==================
-      * 下一版本支持
-      * 1、pdf支持缩放
-      * 2、音频,语音多格式支持
-      * 3、压缩包支持
-      *
-      */
-import ImageViewer from './image'
-// import AudioViewer from './audio' //xianyifan
-// import VideoViewer from './video' //xianyifan
-/* import TxtViewer from './txt' */
-import { officeType, pdfType, txtType, imageType, audioType, videoType } from './constants'
-import PopupManager from '@/utils/popup'
-import editor from '@/business/platform/file/attachment/editFile/editor.vue'
-export default {
-  components: {
-    /* 'pdf-viewer': () => import('./pdf/index.vue'), */
-    ImageViewer,
-    // AudioViewer,
-    // VideoViewer,
-   /* TxtViewer, */
-    editor
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String
-
-    },
-    fileExt: {
-      type: String
-    },
-    url: {
-      type: String,
-      require: true
-    },
-    optionFile: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      fileType: '',
-      zIndex: 2000,
-      /* openedLoaded: false, */
-      fileUrl: '',
-      option: {
-        url: '',
-        isEdit: true,
-        fileType: '',
-        title: '',
-        user: {
-          id: '',
-          name: ''
-        },
-        mode: 'view',
-        editUrl: '',
-        key: ''
-      },
-    }
-  },
- watch: {
-    visible: {
-      handler: function(val, oldVal) {
-        this.dialogVisible = this.visible
-        this.loadViewer()
-      },
-      immediate: true
-    }
-  },
-  beforeDestroy() {
-    this.fileType = ''
-    /* this.openedLoaded = false */
-    this.option = {}
-  },
-  methods: {
     /**
-      * zxh 修复zindex 不是最高的被遮住
-      */
-    fixZIndex() {
-      return PopupManager.getZIndex()
-    },
-   loadViewer() {
-      if (imageType.includes(this.fileExt)) {
-        this.dialogVisible = false
-        this.zIndex = this.fixZIndex()
-        this.fileUrl = this.url
-        this.fileType = 'image'
-      } else {
-        this.openDialog() //先初始化调用参数
-        this.openWindow()//打开外部预览页面
-        this.closeDialog()//关闭当前
-        /* this.fileType = 'FILE' */
-      } /* else if (officeType.includes(this.fileExt) || pdfType.includes(this.fileExt)) {
-        this.fileType = 'pdf'
-      } else if (audioType.includes(this.fileExt)) {
-        this.fileType = 'audio'
-      } else if (videoType.includes(this.fileExt)) {
-        this.fileType = 'video'
-      } else if (txtType.includes(this.fileExt)) {
-        this.fileType = 'txt'
-
-      } */
-    },
-    openWindow(data){
-     let routeData = this.$router.resolve({
-           path: "/fileView",
-           query: this.option
-                });
-        window.open(routeData.href);
-    },
-    openDialog() {
-      this.option.user.id =this.$store.getters.userId
-      this.option.user.name = this.$store.getters.name
-      this.getFile()
-    },
-    getFile() {
-    		this.option.url =  this.optionFile.url //下载地址
-    		this.option.editUrl = this.optionFile.editUrl //回调接口url
-    		this.option.title =this.optionFile.title // 文件名称
-    		this.option.fileType =this.optionFile.fileType //类型
-    },
-/*    openDialog() {
-      if (this.fileType === 'pdf') {
-        this.$nextTick(() => {
-          const timer = setInterval(() => {
-            if (this.openedLoaded) {
-              clearInterval(timer)
-            } else {
-              if (this.$refs.viewer) {
-                this.$refs.viewer.load(this.url)
-                this.openedLoaded = true
-              }
+     * 文件预览
+     * 1、'doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'  类型支持
+     * 2、图片支持缩放
+     * 3、音频,语音支持
+     * ==================
+     * 下一版本支持
+     * 1、pdf支持缩放
+     * 2、音频,语音多格式支持
+     * 3、压缩包支持
+     */
+    import ImageViewer from './image'
+    // import AudioViewer from './audio' //xianyifan
+    // import VideoViewer from './video' //xianyifan
+    // import TxtViewer from './txt'
+    import { officeType, pdfType, txtType, imageType, audioType, videoType } from './constants'
+    import PopupManager from '@/utils/popup'
+    import editor from '@/business/platform/file/attachment/editFile/editor.vue'
+    export default {
+        components: {
+            // 'pdf-viewer': () => import('./pdf/index.vue'),
+            ImageViewer,
+            // AudioViewer,
+            // VideoViewer,
+            // TxtViewer,
+            editor
+        },
+        props: {
+            visible: {
+                type: Boolean,
+                default: false
+            },
+            title: {
+                type: String
+            },
+            fileExt: {
+                type: String
+            },
+            url: {
+                type: String,
+                require: true
+            },
+            optionFile: {
+                type: Object,
+                default: () => {}
             }
-          }, 50)
-        })
-      }
-    }, */
-    closeDialog() {
-      this.fileType = ''
-    /*  this.openedLoaded = false */
-      this.$emit('close', false)
+        },
+        data() {
+            return {
+                dialogVisible: false,
+                fileType: '',
+                zIndex: 2000,
+                // openedLoaded: false,
+                fileUrl: '',
+                option: {
+                    url: '',
+                    isEdit: true,
+                    fileType: '',
+                    title: '',
+                    user: {
+                        id: '',
+                        name: ''
+                    },
+                    mode: 'view',
+                    editUrl: '',
+                    key: ''
+                }
+            }
+        },
+        watch: {
+            visible: {
+                handler: function (val, oldVal) {
+                    this.dialogVisible = this.visible
+                    this.loadViewer()
+                },
+                immediate: true
+            }
+        },
+        beforeDestroy() {
+            this.fileType = ''
+            // this.openedLoaded = false
+            this.option = {}
+        },
+        methods: {
+            /**
+             * zxh 修复zindex 不是最高的被遮住
+             */
+            fixZIndex() {
+                return PopupManager.getZIndex()
+            },
+            loadViewer() {
+                if (imageType.includes(this.fileExt)) {
+                    this.dialogVisible = false
+                    this.zIndex = this.fixZIndex()
+                    this.fileUrl = this.url
+                    this.fileType = 'image'
+                } else {
+                    this.openDialog() // 先初始化调用参数
+                    this.openWindow() // 打开外部预览页面
+                    this.closeDialog() // 关闭当前
+                    // this.fileType = 'FILE'
+                } 
+                // else if (
+                //     officeType.includes(this.fileExt) ||
+                //     pdfType.includes(this.fileExt)
+                // ) {
+                //     this.fileType = 'pdf'
+                // } else if (audioType.includes(this.fileExt)) {
+                //     this.fileType = 'audio'
+                // } else if (videoType.includes(this.fileExt)) {
+                //     this.fileType = 'video'
+                // } else if (txtType.includes(this.fileExt)) {
+                //     this.fileType = 'txt'
+                // }
+            },
+            openWindow(data) {
+                let routeData = this.$router.resolve({
+                    path: '/fileView',
+                    query: this.option
+                })
+                window.open(routeData.href)
+            },
+            openDialog() {
+                this.option.user.id = this.$store.getters.userId
+                this.option.user.name = this.$store.getters.name
+                this.getFile()
+            },
+            getFile() {
+                this.option.url = this.optionFile.url // 下载地址
+                this.option.editUrl = this.optionFile.editUrl // 回调接口url
+                this.option.title = this.optionFile.title // 文件名称
+                this.option.fileType = this.optionFile.fileType // 类型
+            },
+            // openDialog() {
+            //     if (this.fileType === 'pdf') {
+            //         this.$nextTick(() => {
+            //             const timer = setInterval(() => {
+            //                 if (this.openedLoaded) {
+            //                     clearInterval(timer)
+            //                 } else {
+            //                     if (this.$refs.viewer) {
+            //                         this.$refs.viewer.load(this.url)
+            //                         this.openedLoaded = true
+            //                     }
+            //                 }
+            //             }, 50)
+            //         })
+            //     }
+            // },
+            closeDialog() {
+                this.fileType = ''
+                // this.openedLoaded = false
+                this.$emit('close', false)
+            }
+        }
     }
-  }
-}
 </script>
 <style lang="scss">
-  .ibps-file-preview-dialog{
-  .el-dialog__body{
-  padding:0;
-  }
-  .file-type-txt{
-  height:  calc(88vh)!important;
-  }
-  }
+    .ibps-file-preview-dialog {
+        .el-dialog__body {
+            padding: 0;
+        }
+        .file-type-txt {
+            height: calc(88vh) !important;
+        }
+    }
 </style>

+ 1 - 3
src/views/system/jbdHome/board/equipmentBoard.vue

@@ -21,7 +21,6 @@
           <top-bar v-if="topBarData.length" :info="topBarData" />
         </div>
         <dv-decoration-10 style="height:2%;display:flex;" />
-
         <div class="middleCard">
           <div style="width:100%;height: 100%;box-sizing: border-box;overflow: hidden;">
             <div class="middleCardLeft">
@@ -456,8 +455,7 @@ export default {
     },
     async getCarouselShiYonglvTable() {
       let this_ = this;
-      // const sql = `select she_bei_ming_chen,she_bei_bian_hao_ ,create_time_,she_bei_zhuang_ku,d.name_ as bumen ,COUNT(*) AS pinlv FROM t_mjsbsy GROUP BY she_bei_bian_hao_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
-      const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,c.she_bei_shi_bie_h,d.name_ as bumen,COUNT(*) AS pinlv FROM  t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.id_ join ibps_party_org as d on d.id_ = a.bian_zhi_bu_men_ GROUP BY create_time_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
+      const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,c.she_bei_shi_bie_h,d.name_ as bumen,COUNT(*) AS pinlv FROM  t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.she_bei_shi_bie_h join ibps_party_org as d on d.id_ = a.bian_zhi_bu_men_ GROUP BY create_time_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
       let data1 = [];
       let res1 = [];
       this_.shiyonglvConfig.data = [];

+ 36 - 28
src/views/warehouse/cangku.vue

@@ -50,18 +50,17 @@
         <ul class="list-items">
           <li
             class="list-item quyu-item"
-            :style="{
-              background: quyuShow == item.qu_yu_ ? '#FF9900' : '#e5baba',
-            }"
+            :style="{background: quyuShow == item.qu_yu_ ? '#66b1ff' : '#e5baba',}"
             @click="qu_yu_Event"
             v-for="item in quyu_arr"
             :key="item.qu_yu_"
           >
             <div v-if="item.qu_yu_.includes('冰箱')">
-              {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
+           {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
             </div>
 
             <div v-if="!item.qu_yu_.includes('冰箱')">
+              
               {{ item.qu_yu_ | freezerFilters }}
             </div>
           </li>
@@ -86,16 +85,17 @@
                   >
                     <div class="top-dsc">
                       <div class="position">
-                        <p>名称:{{ it.wu_liao_ming_chen }}</p>
-                        <p>编码:{{ it.wu_liao_bian_ma_ || "空" }}</p>
-                        <p>位置:{{ it.cun_fang_wei_zhi_ || "空" }}</p>
-                        <p>货号:{{ it.huo_hao_ || "空" }}</p>
+                        <p><span style="vertical-align: top;">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  称:</span> <span class="matterName">{{ it.wu_liao_ming_chen }}</span></p>
+                        <p><span style="vertical-align: top;">入库批号:</span><span class="matterCode">{{it.ru_ku_pi_hao_ || "空"}}</span></p>
+
+                        <p>位&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 置:{{ it.cun_fang_wei_zhi_ || "空" }}</p>
                       </div>
                       <div class="right-content">
-                        <p>入库批号:{{ it.ru_ku_pi_hao_ || "空" }}</p>
+                        <p><span style="vertical-align: top;">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 码:</span><span class="">{{it.wu_liao_bian_ma_ || "空"}}</span></p>
+                        <p>货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 号:{{ it.huo_hao_ || "空" }}</p>
+                        <p>有效期&nbsp;&nbsp;&nbsp;:{{ it.you_xiao_qi_ || "空" }}</p>
+                        <p>库存量&nbsp;&nbsp;&nbsp;:{{ it.ku_cun_liang_ || "空" }}</p>
                         <p>存储条件:{{ it.cun_chu_yao_qiu_ || "空" }}</p>
-                        <p>有效期:{{ it.you_xiao_qi_ || "空" }}</p>
-                        <p>库存量:{{ it.ku_cun_liang_ || "空" }}</p>
                       </div>
                       <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
                     </div>
@@ -224,7 +224,7 @@ export default {
       this.formInline.qu_yu_value = "1号冰箱";
       this.selectActive = 1;
       this.firstLoadActive = true;
-      this.quyuShow = "1号冰箱";
+      this.quyuShow = "1号冰箱T";
       var sqlString ="select * from t_mjwlgl where cun_fang_wei_zhi_ like" +"'%" +"BX1T" +"%'";
       this.queryLoad(sqlString, "BX1T");
     },
@@ -330,7 +330,6 @@ export default {
             }
           }
           this.listData = newarr;
-          console.log(this.listData, "listData");
         });
       });
     },
@@ -358,8 +357,9 @@ export default {
       this.firstLoadQuyu(newdata);
     },
     "formInline.qu_yu_value": function (newdata) {
+      console.log(newdata)
       this.qu_yu_value = newdata;
-      this.quyuShow = newdata;
+      this.quyuShow = newdata.split("(")[0];
       this.firstLoadActive = false;
     },
   },
@@ -394,7 +394,7 @@ p {
   .huojia {
     width: 100%;
     .list-items {
-      display: flex;
+      // display: flex;
       cursor: pointer;
       .wDTianjian::after {
         content: "2-6";
@@ -407,16 +407,17 @@ p {
         background: #99ccff;
       }
       .list-item {
-        padding: 4px 14px;
-        height: 30px;
+        padding: 7px 5px;
+        // height: 30px;
         background-color: #cec6a4;
         text-align: center;
-        line-height: 30px;
+        // line-height: 30px; 
         margin-left: 20px;
         margin-bottom: 6px;
         /* margin-top: 6px; */
         border-radius: 10px;
         position: relative;
+        display: inline-block;
         .tiaojian {
           // position: absolute;
           // right: 0px;
@@ -501,9 +502,7 @@ p {
             margin-right: 15px;
             .goods-dsc {
               cursor: pointer;
-              // width: 170px;
-              // height: 80px;
-              padding: 6px 12px;
+              padding: 3px 6px;
               border-radius: 5px;
               background: #e6a23c;
               margin-left: 12px;
@@ -514,14 +513,26 @@ p {
                 display: flex;
                 justify-content: space-between;
                 font-size: 12px;
-                height: 18px;
-                line-height: 18px;
+
+                // line-height: 18px;
                 .position > p {
                   text-align: left;
-                  // color: #fbe8ff;
                 }
+                .position .matterName{
+                  min-width: 40px;
+                  max-width: 70px;
+                  display: inline-block;
+                  word-wrap: break-word;
+                }                
+                .position .matterCode{
+                  min-width: 40px;
+                  max-width: 70px;
+                  display: inline-block;
+                  word-wrap: break-word;
+                }
+                
                 .right-content > p {
-                  margin-left: 15px;
+                  margin-left: 1px;
                   // color: #fbe8ff;
                   text-align: left;
                 }
@@ -532,9 +543,6 @@ p {
               .bottom-dsc {
                 width: 100%;
                 font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
                 // color: #fbe8ff;
               }
               .goods-demo {