文件上传

.env.development

@@ -6,12 +6,13 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-#VUE_APP_BASE_API = 'http://10.87.10.55:8081/'
+#VUE_APP_BASE_API = 'http://10.87.10.55:8081'
 #罗俊
-#VUE_APP_BASE_API = 'http://10.87.10.49:8080/'
+#VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.11.94:8080/'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080/'
+VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+#高雄
+#VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

package.json

@@ -75,6 +75,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "html-webpack-plugin": "^5.5.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

src/components/ImageUpload/index.vue

@@ -152,15 +152,14 @@ export default {
     handleUploadSuccess(res, file) {
       console.log(res,'res')
       if (res.code === 200) {
-        getFile(res.data.code).then(res=>{
+        let imgUrl = process.env.VUE_APP_BASE_API + res.data.url
+        this.uploadList.push({ name: res.data.name, url: imgUrl});
+        this.uploadedSuccessfully();
 
           // let str = res.data.code;
           // let blob = new Blob([str],{type:'image/jpeg'});
           // let imgUrl = window.URL.createObjectURL(blob);
           // debugger
-          this.uploadList.push({ name: res.data.name, url:imgUrl });
-          this.uploadedSuccessfully();
-        })
       } else {
         this.number--;
         this.$modal.closeLoading();
@@ -188,6 +187,7 @@ export default {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
         this.number = 0;
+        console.log(this.listToString(this.fileList),'ppppp')
         this.$emit("input", this.listToString(this.fileList));
         this.$modal.closeLoading();
       }

src/main.js

@@ -11,6 +11,7 @@ import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 import './assets/icons' // icon
 import './permission' // permission control
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import {
@@ -40,6 +41,8 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+// 下拉tree组件
+import TreeSelect from "@riophae/vue-treeselect";
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -68,6 +71,7 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('TreeSelect', TreeSelect)
 
 Vue.use(directive)
 Vue.use(plugins)

src/views/system/dept/extend.vue

@@ -35,7 +35,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType" label="天气区域编码">
+            <el-form-item v-if="!orgType" label="天气区域编码">
               <el-input
                 v-model="weatherAreaCode"
                 placeholder="天气区域编码"
@@ -43,7 +43,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType" label="营业场所面积">
+            <el-form-item v-if="!orgType" label="营业场所面积">
               <el-input
                 v-model="premisesArea"
                 placeholder="营业场所面积"
@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item
-              v-if="!orgType"
+              v-if="orgType"
               label="建设时间"
               prop="constructionTime"
             >
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item
-              v-if="!orgType"
+              v-if="orgType"
               label="最近一次更新"
               prop="lastUpdateTime"
             >
@@ -83,7 +83,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="!orgType" label="平台品牌">
+            <el-form-item v-if="orgType" label="平台品牌">
               <el-select v-model="platformBrand" placeholder="平台品牌">
                 <el-option
                   v-for="(platformB, key) in platformBrands"
@@ -95,7 +95,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="!orgType" label="平台供应商品牌">
+            <el-form-item v-if="orgType" label="平台供应商品牌">
               <el-select
                 v-model="platformSupplierBrand"
                 placeholder="平台供应商品牌"
@@ -112,7 +112,7 @@
         </el-row>
       </el-form>
     </div>
-    <div v-if="orgType" class="info-box">
+    <div v-if="!orgType" class="info-box">
       <!--  下拉框选择    -->
       <div>
         <el-switch
@@ -244,7 +244,7 @@
       </div>
     </div>
 
-    <div v-if="orgType">
+    <div v-if="!orgType">
       <h3 class="title">业务库设置</h3>
       <div class="info-box">
         <el-form inline label-position="left" label-width="100px">

src/views/system/user/extend.vue

@@ -14,7 +14,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="是否专职" prop="isFullTime">
-            
+
               <el-switch
                 v-model="formData.isFullTime"
                 active-text
@@ -51,7 +51,7 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
        
@@ -79,7 +79,7 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
@@ -158,14 +158,14 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="上传相关证书">
-              <image-upload :limit="5" :fileSize="2"></image-upload>
+              <image-upload :limit="5" :fileSize="2" @input="getImgUrl"></image-upload>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
@@ -307,6 +307,9 @@ export default {
           ],
           desc: [
             { required: true, message: '请填写活动形式', trigger: 'blur' }
+          ],
+          qualificationCertificateUrl: [
+            { required: true, message: '请上传资格证', trigger: 'change' }
           ]
       },
       // 机构树选项
@@ -370,6 +373,7 @@ export default {
       propItem: "",
 
       row: "",
+      imgs:[]
     };
   },
 
@@ -389,7 +393,10 @@ export default {
   },
   mounted() {},
   methods: {
-    request() {},
+    getImgUrl(img){
+      this.imgs.push(img);
+      console.log(this.imgs,'imgs')
+    },
     handleChange(value) {},
     //自定义数据
     tenantIdnormalizer(node, instanceId) {
@@ -420,15 +427,16 @@ export default {
     },
     saveExtend(){
       this.formData.userId = this.$route.params.userId;
+      this.formData.qualificationCertificateUrl = this.imgs.toString(',');
       this.$refs['form'].validate((valid) => {
           if (valid) {
             extendUserInformation(this.formData).then(res=>{
                 this.$message.success('保存成功！')
                 this.$router.go(-1)
             })
-          } 
+          }
         });
-    
+
     },
     getExtendInfo() {
       getExtendByOrgId(this.$route.params.id).then((data) => {
@@ -657,7 +665,7 @@ export default {
     //     responsibilitiesLeaderName: this.responsibilitiesLeaderName,
     //     responsibilitiesLeaderDuties: this.responsibilitiesLeaderDuties,
     //     qualificationCertificateUrl: this.qualificationCertificateUrl,
-      
+
     //     id: this.id,
     //   };
     //   if(this.extendId){

src/views/system/user/index.vue

@@ -275,13 +275,13 @@
 import OrgTree from '@/components/orgTree'
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
-import TreeSelect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {deptTreeSelect} from "@/api/system/public";
+
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { OrgTree,TreeSelect },
+  components: { OrgTree },
   data() {
     return {
       // 遮罩层
@@ -303,9 +303,9 @@ export default {
       // 是否显示弹出层
       open: false,
       // 机构名称
-      deptName: undefined,
+      deptName: null,
       // 默认密码
-      initPassword: undefined,
+      initPassword: null,
       // 日期范围
       dateRange: [],
       // 岗位选项
@@ -379,10 +379,12 @@ export default {
       },
       //默认选中节点
       defaultKeys:null,
+      //修改新增中的机构树
       deptOptions:[],
     };
   },
   created() {
+    this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -391,6 +393,12 @@ export default {
     console.log(this.queryParams,'aaaaaa')
   },
   methods: {
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
@@ -401,7 +409,7 @@ export default {
       const userId = row.id;
       this.$router.push("/system/user-extend/extend/" + userId);
     },
-    //自定义数据
+    /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
         delete node.children