代码上传

src/HManagement/archvies_mag/modules/add.vue

@@ -36,7 +36,7 @@ export default {
         "method": "createFolder",
         "content": {
           "foldername": "文件夹名称",
-          "parentid":  ''
+          "parentid": JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid,
         }
       }
     }

src/HManagement/clueManage/clue_rule/modules/select_agent.vue

@@ -3,7 +3,10 @@
     <el-dialog title="添加经销商" :visible.sync="dialogTableVisible" width="800px">
       <tablelayout :layout="tablecols" :data="list" :custom="true" :checkbox="true" height="calc(100vh - 452px)" @checkboxCallBack="checkboxCallBack">
         <template v-slot:customcol="scope">
-          <p>{{scope.column.data[scope.column.columnname]}}</p>
+          <div v-if="scope.column.columnname === 'province'">
+            <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
       </tablelayout>
       <div style="margin-top:16px;text-align:right">

src/HManagement/clueManage/clue_rule/modules/setAgent.vue

@@ -11,7 +11,10 @@
     </div>
     <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 452px)">
       <template v-slot:customcol="scope">
-        <p>{{scope.column.data[scope.column.columnname]}}</p>
+        <div v-if="scope.column.columnname === 'province'">
+          <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
         <slot name="del" :data="scope"></slot>

src/HManagement/department/staff/detail/modules/main.vue

@@ -35,7 +35,7 @@
               <slot name="linkact" :data="mainInfo"></slot>
             </div>
           </div>
-          <el-descriptions-item label="头像"><img width="40" style="margin-top:-8px" src="../../../../../assets/avatar.png" alt=""></el-descriptions-item>
+          <!-- <el-descriptions-item label="头像"><img width="40" style="margin-top:-8px" src="../../../../../assets/avatar.png" alt=""></el-descriptions-item> -->
           <el-descriptions-item label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
           <el-descriptions-item label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
           <el-descriptions-item label="角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>

src/HManagement/submit/list/modules/content.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="container normal-panel">
     <!-- 表格 -->
+    <excel class="normal-margin" :tablecols="tablecols" :param="params" excelTitle="提报明细"></excel>
     <tableLayout :layout="tablecols" :data="list" :custom="false" height="calc(100vh - 131px)">
       <template v-slot:customcol="scope">
         <p>{{scope.column.data[scope.column.columnname]}}</p>
@@ -40,13 +41,25 @@
 </template>
 
 <script>
+import excel from '@/components/export_excel/index.vue'
+
 export default {
+  components:{
+    excel
+  },
   data () {
     return {
       dialogTableVisible:false,
       list:[],
       tablecols:[],
-      attinfos:[]
+      attinfos:[],
+      params:{
+        "classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "selectSubmitDetailList",
+        "content": {
+          "sat_submiteditmodelid": this.$route.query.id
+        }
+      }
     }
   },
   methods:{

src/components/layout/index.vue

@@ -19,11 +19,11 @@
           <p>{{item.systemmodulename}}</p>
         </div>
       </div>
-      <div class="nav-bottom-item">
+      <!-- <div class="nav-bottom-item">
         <div class="item">
            <img width="30" src="../../assets/nav_icon/more.svg" alt="">
         </div>
-      </div>
+      </div> -->
     </div>
     <el-container>
       <socket-message></socket-message>
@@ -105,7 +105,13 @@ export default {
         }
       })
       this.$store.dispatch('setUsershortcuts')
-      this.$router.go(-1)
+      
+      // 若当前删除模块为激活红的模块则返回首页
+      let systemmodulename = JSON.parse(sessionStorage.getItem('active_modules')).systemmodulename
+      if (item.systemmodulename === systemmodulename) {
+        this.$router.replace({path:'/home'})
+      }
+      
     }
   },
   created () {
@@ -146,6 +152,9 @@ export default {
   background: #f1f2f3;
   overflow: hidden;
 }
+.nav-top-item{
+  overflow: scroll;
+}
 .item{
   position: relative;
   width: 40px;

src/components/layout/modules/header.vue

@@ -5,7 +5,7 @@
     <el-dropdown>
       <span class="el-dropdown-link">
         <div class="flex">
-          <img height="30" src="../../../assets/avatar.png" alt="">&emsp;{{siteinfo.enterprisename}}<i class="el-icon-arrow-down el-icon--right"></i>
+          {{siteinfo.enterprisename}}<i class="el-icon-arrow-down el-icon--right"></i>
         </div>
       </span>
       <el-dropdown-menu slot="dropdown">

src/components/selectMenber/modules/dep_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tree-panel">
-    <el-tree
+    <!-- <el-tree
       ref="cusTreeRef"
       :data="deplist"
       node-key="departmentid"
@@ -18,6 +18,23 @@
           <slot name="operation" :data="data"></slot>
         </span>
       </span>
+    </el-tree> -->
+    <el-tree
+      :data="deplist"
+      show-checkbox
+      highlight-current
+      default-expand-all
+      :check-strictly="true"
+      :default-checked-keys="dep_default"
+      :expand-on-click-node="false"
+      @check="handleCheck"
+      @check-change="handleCheckChange">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span>
+          <slot name="operation" :data="data"></slot>
+        </span>
+      </span>
     </el-tree>
   </div>
 </template>

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.b1222ca2.js"></script><link href="css/app.3f7651de.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.01abcfd5.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.6535ca5b.js"></script><link href="css/app.3f7651de.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.fac78e71.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>