浏览代码

取消线索未匹配经销商时默认选取第一个的规则

zhangqiOMG 2 年之前
父节点
当前提交
6fa6083edb

+ 1 - 1
src/SManagement/archives_upload/components/FileList.vue

@@ -10,7 +10,7 @@
       <el-table-column prop="document" label="文件名称" width="500">
         <template slot-scope="scope">
           <div class="editor-handle">
-            <span>{{ scope.row.document.substr(0, scope.row.document.indexOf('.')) }}</span>
+            <span>{{ scope.row.document }}</span>
           </div>
         </template>
       </el-table-column>

+ 0 - 1
src/SManagement/archives_upload/components/upload.vue

@@ -81,7 +81,6 @@ export default {
       var index = file.raw.name.lastIndexOf(".");
       var ext = file.name.substr(index + 1);
       this.params.content.filename = file.raw.name
-
       this.params.content.filetype = ext
       this.getUploadUrl(file, ext)
     },

+ 9 - 15
src/SManagement/archives_upload/index.vue

@@ -20,24 +20,14 @@
         </file-list>
         <!--富文本-->
         <file-text ref="text" v-if="uploadType == '3'">
-          <Editor
-            ref="editor"
-            slot="editor"
-            :content="cacheInfo.content.content"
-            :id="uploadCacheData.sat_sharematerialid"
-          ></Editor>
+          <Editor ref="editor" slot="editor" :content="cacheInfo.content.content"
+            :id="uploadCacheData.sat_sharematerialid"></Editor>
         </file-text>
       </el-col>
       <!-- 授权范围 -->
       <el-col :span="10">
-        <scopeOfauth
-          style="margin-left:10px;"
-          :defaultData="defaultData"
-          :dataid="authId"
-          appidname="sat_sharematerialid"
-          obiectName="sat_sharematerial"
-          @onChecked="onChecked"
-        />
+        <scopeOfauth style="margin-left:10px;" :defaultData="defaultData" :dataid="authId"
+          appidname="sat_sharematerialid" obiectName="sat_sharematerial" @onChecked="onChecked" />
       </el-col>
     </el-row>
   </div>
@@ -133,7 +123,11 @@ export default {
     },
     /* 更新附件列表数据 */
     randerData () {
-      if (this.uploadType != 3) this.$refs.attFileList.randerData(this.uploadCacheData.attinfos)
+      if (this.uploadType != 3) {
+        this.$nextTick(() => {
+          this.$refs.attFileList.randerData(this.uploadCacheData.attinfos)
+        })
+      }
     },
     deleteFile (id) {
       this.uploadCacheData.attinfos = this.uploadCacheData.attinfos.filter(v => v.linksid != id)

+ 3 - 3
src/SManagement/orderclue/index.vue

@@ -8,18 +8,18 @@
           <edit :detailInfo="scope.data" 
                 @updataList="updataList"
                 :arealist="arealist" 
-                v-if="userInfo.name == scope.data.data.leadername && userInfo.name == scope.data.data.leadername ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></edit>
+                v-if="userInfo.name == scope.data.data.leadername ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></edit>
       </template>
       <template v-slot:goUp="scope">
         <follow :detailInfo="scope.data" 
                 @updataList="updataList" 
-                v-if="userInfo.name == scope.data.data.leadername && userInfo.name == scope.data.data.leadername ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></follow>
+                v-if="userInfo.name == scope.data.data.leadername  ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></follow>
       </template>
       <template v-slot:move="scope">
         <move :data="[scope.data.data.sat_orderclueid]" 
               @updataList="updataList" 
               :teamList="teamList"  
-              v-if="userInfo.isAuth == 1 && userInfo.isAuth == 1 ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></move>
+              v-if="userInfo.isAuth == 1 ? scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' : ''"></move>
       </template>
     </list>
   </div>

+ 3 - 3
src/components/selectMenber/staff/list/list.vue

@@ -5,7 +5,7 @@
       <slot name="staff"></slot>
     </div>
     <el-input style="width:270px" placeholder="请输入内容" v-model="param.content.where.condition" class="input-with-select normal-margin" size="small" clearable>
-      <el-button slot="append" icon="el-icon-search"  @click="listData(param.content.departmentid)">查 询</el-button>
+      <el-button slot="append" icon="el-icon-search"  @click="param.content.pageNumber=1,listData(param.content.departmentids[0])">查 询</el-button>
     </el-input>
     <!-- <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="false" height="calc(100vh - 508px)">
       <template v-slot:opreation="scope">
@@ -96,12 +96,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.departmentids[0])
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.departmentids[0])
     }
   },
   mounted () {

+ 1 - 1
src/components/upload/hw_obs_upload.vue

@@ -84,7 +84,7 @@ export default {
       this.filelist = filelist
       var index = file.raw.name.lastIndexOf(".");
       var ext = file.name.substr(index + 1);
-      this.params.content.filename = file.raw.name
+      this.params.content.filename = file.raw.name      
       this.params.content.filetype = ext
       this.getUploadUrl(file, ext)
     },

+ 1 - 1
src/router/SManagement.js

@@ -42,7 +42,7 @@ const SManagement = [{
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/archives_ad/index.vue')
 }, {
   path: '/upload_archives',
-  name: 'upload',
+  name: 'archives_adlist',
   meta: {
     title: '上传素材',
     ast_nav: true,

+ 4 - 0
src/utils/tool.js

@@ -13,6 +13,8 @@ export default {
       let active_modules = module_list.filter(item => {
         return item.name === appname
       })
+      console.log(active_modules);
+      
       // 获取当前应用权限
       let auth_list = active_modules[0].meta.auth
       // 判断是否拥有权限
@@ -20,6 +22,8 @@ export default {
 
       return _haveAuth
     } catch (error) {
+      console.log(error);
+      
       router.replace('/home')
     }
    

+ 1 - 1
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>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.9c2ca1a9.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.c2e0a533.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 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>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.ca878a1c.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.499037e5.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>