feature：文件上传添加pdf类型

.env.production

@@ -2,17 +2,39 @@
 VUE_APP_TENANT=8b9ec443
 
 # websocket地址
-VUE_APP_WEBSOCKET_URL=wss://oms.dashoo.cn/ws
+VUE_APP_WEBSOCKET_URL=ws://oms.bowei-bio.com:8080/ws
 
 # GateWay地址
-VUE_APP_MicroSrvProxy_API=https://oms.dashoo.cn/api/
+VUE_APP_MicroSrvProxy_API=http://oms.bowei-bio.com:8080/api/
 # 登录验证微服务名称
 VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
 # 业务接口微服务名称
 VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
 
 # 文件上传
-VUE_APP_PROTOCOL='https://'
-VUE_APP_UPLOAD_WEED='https://oms.dashoo.cn/dir/assign'
+VUE_APP_PROTOCOL='http://'
+VUE_APP_UPLOAD_WEED='http://oms.bowei-bio.com:8080/dir/assign'
 # 文件一步上传
-VUE_APP_UPLOAD_FILE_WEED='https://oms.dashoo.cn/weedfs/upload'
+VUE_APP_UPLOAD_FILE_WEED='http://oms.bowei-bio.com:8080/weedfs/upload'
+
+
+
+
+## 租户码
+#VUE_APP_TENANT=8b9ec443
+#
+## websocket地址
+#VUE_APP_WEBSOCKET_URL=wss://oms.dashoo.cn/ws
+#
+## GateWay地址
+#VUE_APP_MicroSrvProxy_API=https://oms.dashoo.cn/api/
+## 登录验证微服务名称
+#VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
+## 业务接口微服务名称
+#VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
+#
+## 文件上传
+#VUE_APP_PROTOCOL='https://'
+#VUE_APP_UPLOAD_WEED='https://oms.dashoo.cn/dir/assign'
+## 文件一步上传
+#VUE_APP_UPLOAD_FILE_WEED='https://oms.dashoo.cn/weedfs/upload'

src/views/base/partners/index.vue

@@ -201,10 +201,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/contract/components/ApplyContract.vue

@@ -110,10 +110,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/contract/components/DetailsEnclosure.vue

@@ -95,10 +95,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/proj/business/components/BusinessGradation.vue

@@ -375,10 +375,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },
@@ -477,7 +477,8 @@
           this.form.contactId = val[0].id
           this.form.contactName = val.map((item) => item.cuctName).join()
           this.form.contactPostion = val.map((item) => item.postion).join()
-          this.form.contactTelephone = val.map((item) => {
+          this.form.contactTelephone = val
+            .map((item) => {
               if (item.telephone !== '' && item.wechat !== '') {
                 return item.telephone + '/' + item.wechat
               }
@@ -487,7 +488,8 @@
               if (item.wechat !== '') {
                 return item.wechat
               }
-            }).join()
+            })
+            .join()
         }
       },
       handleSelectDistributorContact() {

src/views/proj/business/components/DetailsEnclosure.vue

@@ -95,10 +95,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt,.pdf',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt,.pdf',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/proj/business/components/FollowAdd.vue

@@ -184,10 +184,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/system/user/index.vue

@@ -66,7 +66,7 @@
               {{ $index + 1 }}
             </template>
           </el-table-column>-->
-          <el-table-column v-permissions="['SysAdmin']" align="center" label="id" prop="id" width="60" />
+          <el-table-column v-if="hasPermission(['SysAdmin'])" align="center" label="id" prop="id" width="60" />
           <el-table-column align="center" label="用户名" prop="userName" show-overflow-tooltip />
           <el-table-column align="center" label="昵称" prop="nickName" show-overflow-tooltip />
           <el-table-column align="center" label="手机号" prop="phone" show-overflow-tooltip />
@@ -119,6 +119,7 @@
 </template>
 
 <script>
+  import { hasPermission } from '@/utils/permission'
   import deptApi from '@/api/system/dept'
   import userApi from '@/api/system/user'
   import Edit from './components/UserEdit'
@@ -164,6 +165,7 @@
       })
     },
     methods: {
+      hasPermission,
       /** 查询部门下拉树结构 */
       async getTreeselect() {
         const { data: data } = await deptApi.getTree({

src/views/work/deliver/components/completeProgress.vue

@@ -89,10 +89,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/deliver/components/deliver.vue

@@ -100,10 +100,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/deliver/components/inspect.vue

@@ -72,10 +72,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/deliver/components/pictrues.vue

@@ -61,10 +61,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/deliver/components/productSign.vue

@@ -54,10 +54,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/deliver/components/softwareComplete.vue

@@ -125,10 +125,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },

src/views/work/train/sale/components/finish.vue

@@ -55,10 +55,10 @@
         fileSettings: {
           // 文件配置信息
           fileSize: 52428800,
-          fileTypes: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
+          fileTypes: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.txt',
           pictureSize: 52428800,
           pictureTypes: '.jpg,.jpeg,.gif,.png,.jfif,.txt',
-          types: '.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
+          types: '.pdf,.doc,.docx,.zip,.xls,.xlsx,.rar,.jpg,.jpeg,.gif,.png,.jfif,.mp4,.txt',
           videoSize: 104857600,
           videoType: '.mp4',
         },