2024-2-10

src/HManagement/archvies_mag/modules/download.vue

@@ -17,7 +17,7 @@ export default {
           this.downLoadFolder(e.attachmentid)
           this.$store.dispatch('createdownlog',{linksid:'',attachmentid:e.attachmentid})
         } else {
-          this.dowFile(e.url)
+          this.dowFile(e)
           this.$store.dispatch('createdownlog',{linksid:'',attachmentid:e.attachmentid})
         }
       });
@@ -40,14 +40,29 @@ export default {
     },
     
     // 一般附件下载
-    dowFile (url) {
-      console.log(url);
-      var hiddenIFrameID = 'hiddenDownloader' + this.count++;
-      var iframe = document.createElement('iframe');
-      iframe.id = hiddenIFrameID;
-      iframe.style.display = 'none';
-      document.body.appendChild(iframe);
-      iframe.src = url //直接下载，不会弹出新的页面
+    dowFile (target) {
+      if (target.postfix == 'PDF') {
+        this.$axios.get(target.url,{
+          responseType:'blob'
+        }).then((res) => {
+          console.log(res);
+          let a = document.createElement('a')
+          let url = window.URL.createObjectURL(res.data)
+          a.href = url
+          a.download = target.document
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          window.URL.revokeObjectURL(a)
+        })
+      } else {
+        var hiddenIFrameID = 'hiddenDownloader' + this.count++;
+        var iframe = document.createElement('iframe');
+        iframe.id = hiddenIFrameID;
+        iframe.style.display = 'none';
+        document.body.appendChild(iframe);
+        iframe.src = target.url //直接下载，不会弹出新的页面
+      }
     }
   }
 }

src/HManagement/department/staff/list/modules/add.vue

@@ -41,30 +41,33 @@
             <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
           </el-form-item>
         </el-col>
-        <el-col class="mb-30" :span="12">
+        <!-- <el-col class="mb-30" :span="12">
           <el-form-item label="部门:">
             <el-input v-model="form.depname" readonly placeholder="请选择" suffix-icon="el-icon-arrow-down" @focus="showTree = true" autocomplete="off"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col class="mb-30" :span="12">
           <el-form-item label="办公电话:">
             <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="showTree">
+        <el-col :span="24">
+        <!-- <el-col :span="24" v-if="showTree"> -->
           <el-form-item label="选择部门:">
             <div style="border:1px solid #f1f2f3">
               <el-tree
                 :data="deplist"
-                node-key="id"
+                node-key="departmentid"
                 default-expand-all
                 highlight-current
-                :expand-on-click-node="false">
+                :expand-on-click-node="false"
+                @node-click="selectDep"
+                :current-node-key="form.departmentid">
                 <span class="custom-tree-node" slot-scope="{ node, data }">
                   <span>{{ node.label }}</span>
-                  <span>
+                  <!-- <span>
                     <el-button size="small" type="text" @click="selectDep(data)">选 择</el-button>
-                  </span>
+                  </span> -->
                 </span>
               </el-tree>
             </div>

src/HManagement/department/staff/list/modules/edit.vue

@@ -42,30 +42,33 @@
             <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
           </el-form-item>
         </el-col>
-        <el-col class="mb-30" :span="12">
+        <!-- <el-col class="mb-30" :span="12">
           <el-form-item label="部门:">
             <el-input v-model="form.depname" readonly placeholder="请选择" suffix-icon="el-icon-arrow-down" @focus="showTree = true" autocomplete="off"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col class="mb-30" :span="12">
           <el-form-item label="办公电话:">
             <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="showTree">
+        <el-col :span="24" v-if="dialogFormVisible">
           <el-form-item label="选择部门:">
             <div style="border:1px solid #f1f2f3">
               <el-tree
+                ref="tree"
                 :data="deplist"
-                node-key="id"
+                node-key="departmentid"
                 default-expand-all
                 highlight-current
-                :expand-on-click-node="false">
+                :current-node-key="form.departmentid"
+                :expand-on-click-node="false"
+                @node-click="selectDep">
                 <span class="custom-tree-node" slot-scope="{ node, data }">
                   <span>{{ node.label }}</span>
-                  <span>
+                  <!-- <span>
                     <el-button size="small" type="text" @click="selectDep(data)">选 择</el-button>
-                  </span>
+                  </span> -->
                 </span>
               </el-tree>
             </div>
@@ -147,7 +150,7 @@ export default {
         "email":"",
         "birthday":"",
         "remarks":"",
-        "departmentid":"",
+        "departmentid":'',
         "isleader":"",
         "position":"",
         "reporthrid":"",
@@ -169,7 +172,8 @@ export default {
         }
       })
       this.form = Object.assign({},this.form, res.data)
-      console.log(this.form);
+      // this.$refs.tree.setCurrentKey(this.form.departmentid)
+      console.log(this.form.departmentid);
     },
     async department () {
       const res = await this.$api.requested({
@@ -216,6 +220,7 @@ export default {
       return arr
     },
     onShow () {
+      this.form.departmentid = this.data.departmentid
       this.query_hrMain()
       this.department()
       this.$store.dispatch('optiontypeselect','sex')

src/api/request.js

@@ -32,7 +32,7 @@ const service = axios.create({
     // 公共接口--这里注意后面会讲
     baseURL:process.env.NODE_ENV === 'production' ? GET_API_URL():process.env.BASE_API,
     // 超时时间 单位是ms，这里设置了3s的超时时间
-    // timeout: 60 * 1000
+    timeout: 60 * 1000
 })
 let loadingInstance = ''
 // 2.请求拦截器

src/components/layout/modules/header.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="flex">
-  <div class="logo">多三边营销管理平台</div>
+  <div class="logo">多三边营销宝</div>
   <div class="right-operation">
     <el-dropdown>
       <span class="el-dropdown-link">

src/views/login/login.vue

@@ -5,7 +5,7 @@
     <div class="login-wrap">
       <div>
         <div class="logo">
-          <span>多三边营销管理平台</span><br>
+          <span>多三边营销宝</span><br>
           <small>DUOSANBIAN-MANAGE-SYSTEM</small>
         </div>
         <div class="login-form">
@@ -215,9 +215,10 @@ export default {
   display: block;
   font-size: 24px;
   line-height: 15px;
+  color: #ffffff;
 }
 .logo small {
-  color: #999;
+  color: rgba(255, 255, 255, .8)
 }
 .title {
   display: flex;
@@ -235,9 +236,10 @@ export default {
   justify-content: space-around;
   width: 100%;
   height: 100vh;
-  /* background: #fff no-repeat 50% url(../../assets/bg.png); */
-  background: #f1f2f3;
-  background-size: 2560px 1490px;
+  background: #fff no-repeat 50% url(../../assets/bg.jpg);
+  background-size: cover;
+  background-position: center center;
+  /* background: #f1f2f3; */
 }
 .login-form {
   /* min-height: 500px; */

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
   },
   chainWebpack(config) {
 		config.plugin('html').tap((args) => { //标题
-			args[0].title = '多三边营销管理平台';
+			args[0].title = '多三边营销宝';
 			return args;
 		})
 	},