vue2-client 1.2.98 → 1.2.99-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.98",
+  "version": "1.2.99-test",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -27,6 +27,7 @@
     "enquire.js": "^2.1.6",
     "file-saver": "^2.0.5",
     "highlight.js": "^10.7.3",
+    "js-base64": "^3.7.2",
     "js-cookie": "^2.2.1",
     "jsencrypt": "^3.2.1",
     "lodash.get": "^4.4.2",

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

@@ -79,15 +79,6 @@ export default {
       type: Array,
       default: () => []
     },
-    // 默认选中key
-    defaultCheckedNames: {
-      type: Array,
-      default: () => []
-    },
-    defaultCheckedIds: {
-      type: Array,
-      default: () => []
-    },
     // // 返回数据类型 String,Array 发现返回类型只能有一个
     // type: {
     //   type: String,
@@ -115,10 +106,8 @@ export default {
       this.visible = true
       this.searchValue = ''
       this.treeData = this.sourceTreeData
-      if (this.defaultCheckedIds.length > 0) {
-        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedIds)
-      } else if (this.defaultCheckedNames.length > 0) {
-        this.checkedKeys = this.getCheckedKeys(this.defaultCheckedNames)
+      if (this.value.length > 0) {
+        this.checkedKeys = this.getCheckedKeys(this.value)
       }
       this.expandedKeys = []
     },

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

@@ -70,7 +70,12 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   created () {
-    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
+    const list = this.model.type === 'file' ? [...this.files] : [...this.images]
+    if (this.model.useType) {
+      this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)
+    } else {
+      this.uploadedFileList = list
+    }
   },
   methods: {
     uploadFiles (info) {

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

@@ -323,7 +323,11 @@ export default {
           }
           const item = this.realJsonData[i]
           if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            if (this.modifyModelData.data[item.model] instanceof Array) {
+              this.form[item.model] = this.modifyModelData.data[item.model]
+            } else {
+              this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            }
           } else {
             this.form[item.model] = undefined
           }

package/src/layouts/header/HeaderNotice.vue

@@ -37,26 +37,43 @@
         <a-icon :class="['header-notice-icon']" type="bell"/>
       </a-badge>
     </span>
+    <a-drawer
+      placement="right"
+      title="待确认制度详情"
+      :width="screenWidth * 0.5"
+      :visible="institutionDetailVisible"
+      @close="institutionDetailVisible = false"
+    >
+      <institution-detail
+        :institutionId="institution"
+        affirmInstitution="affirmInstitution"
+        @get_to_be_confirmed="getToBeConfirmed"/>
+    </a-drawer>
   </a-dropdown>
 </template>
 
 <script>
 import { post } from '@vue2-client/services/api'
-import { mapState } from 'vuex'
+import InstitutionDetail from './InstitutionDetail'
 
 export default {
   name: 'HeaderNotice',
   data () {
     return {
       loading: false,
+      screenWidth: document.documentElement.clientWidth,
       show: false,
+      institutionDetailVisible: false,
+      institution: undefined,
+      affirmInstitution: undefined,
       exception: [],
       backlog: []
     }
   },
+  components: { InstitutionDetail },
   computed: {},
   created () {
-    this.get_to_be_confirmed()
+    this.getToBeConfirmed()
   },
   methods: {
     read (item) {
@@ -69,7 +86,7 @@ export default {
         this.refresh()
       })
     },
-    get_to_be_confirmed (item) {
+    getToBeConfirmed () {
       try {
         if (this.$login.f.name) {
           post('/webmetersql/getToBeConfirmed', { data: { condition: `state = '待确认' and f_affirm_by  = '${this.$login.f.name}'` } }).then(res => {
@@ -81,18 +98,9 @@ export default {
       }
     },
     confirm_institution (item) {
-      post('/webmeterapi/affirmInstitution', {
-        data: {
-          tobe: [
-            {
-              id: item.id,
-              f_affirm_type: '系统确认'
-            }
-          ]
-        }
-      }).then(res => {
-        this.get_to_be_confirmed()
-      })
+      this.institution = item.institution
+      this.affirmInstitution = item.id
+      this.institutionDetailVisible = true
     },
     refresh () {
       post('/webmeterapi/commonQuery', {

package/src/layouts/header/InstitutionDetail.vue

@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
+    <p>简述: {{ institutionData.f_sketch }}</p>
+    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
+    <div v-if="showDocument" class="content">
+      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
+    </div>
+    <!-- 其他附件 -->
+    <div class="other-file">
+      <div class="title">其他附件</div>
+      <div v-for="file in otherFiles" :key="file.id">
+        <a class="file-item">
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="link" />{{ file.name }}
+          </span>
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="eye" />预览
+          </span>
+          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
+        </a>
+      </div>
+    </div>
+    <!-- 其他附件预览 -->
+    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
+      <div class="preview-doc-container">
+        <a-spin size="large" :spinning="previewDocLoading" />
+        <iframe
+          v-show="!previewDocLoading"
+          :src="previewDocUrl"
+          width="100%"
+          height="100%"
+          frameborder="0"
+          @load="previewDocLoading = false" />
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { Base64 } from 'js-base64'
+import { post } from '@vue2-client/services/api/restTools'
+import { formatDate } from '@vue2-client/utils/util'
+
+export default {
+  name: 'InstitutionDetail',
+  props: {
+    institutionId: {
+      type: Number,
+      default: undefined
+    },
+    affirmInstitution: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      institutionDocUrl: undefined,
+      showDocument: false,
+      otherFiles: [],
+      institutionData: {},
+      previewDocVisible: false,
+      previewDocUrl: undefined,
+      previewDocLoading: false
+    }
+  },
+  watch: {
+    institutionId () {
+      this.getDetailData()
+    }
+  },
+  mounted () {
+    this.getDetailData()
+  },
+  methods: {
+    // 获取详情数据
+    getDetailData () {
+      if (!this.institutionId) {
+        return
+      }
+      const otherFiles = []
+      post('/webmeterapi/getInstitutionDetail', {
+        id: this.institutionId
+      }).then(res => {
+        res.files.forEach(item => {
+          if (item.use_type === '制度文件') {
+            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
+            this.institutionDocUrl = institutionDocUrl
+            this.showDocument = true
+          } else {
+            otherFiles.push(item)
+          }
+        })
+        this.institutionData = res.institution
+        this.otherFiles = otherFiles
+      })
+    },
+    format (dateStr) {
+      return formatDate(dateStr, 'yyyy-MM-dd')
+    },
+    // 其他附件预览
+    handlePreviewDoc (url) {
+      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
+      if (this.previewDocUrl != previewDocUrl) {
+        this.previewDocLoading = true
+        this.previewDocUrl = previewDocUrl
+      }
+      this.previewDocVisible = true
+    },
+    // 下载文档
+    handlePreDowDoc (file) {
+      const a = document.createElement('a')
+      a.href = file.url
+      a.download = file.name
+      a.click()
+    },
+    confirm_institution (item) {
+      this.institution = item.institution
+      post('/webmeterapi/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: item.id,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.$emit('get_to_be_confirmed')
+      })
+    },
+  }
+}
+// 文档预览服务 API
+const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
+// 文件服务器地址
+const fileServer = 'http://123.60.214.109:8406'
+</script>
+
+<style lang="less" scoped>
+.content {
+  height: 80vh;
+  img {
+    max-width: 100%;
+  }
+}
+.other-file {
+  margin: 16px 0;
+  .title {
+    margin-bottom: 6px;
+  }
+}
+.file-item {
+  .file-action {
+    padding: 3px 4px;
+    color: #1890ff;
+    &:hover {
+      background: #e6f7ff;
+    }
+  }
+  .anticon {
+    margin-right: 3px;
+  }
+}
+.file-list-title {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+.preview-doc-container {
+  height: calc(100vh - 92px);
+  padding-top: 20px;
+}
+</style>