2022-11-4

src/HManagement/marketing/agent/list.vue

@@ -59,7 +59,7 @@ export default {
         "content": {
           "pageSize":20,
           "pageNumber":1,
-          "sa_saleareaids":null,
+          "sa_saleareaids":'',
           "containssub": 1,
           "where":{}
         }

src/HManagement/marketing/area/list.vue

@@ -83,12 +83,13 @@ export default {
     },
   },
   mounted () {
-    this.query_arealist(()=>{
-      if (this.noDefaultData === undefined) {
-        this.$emit('onClick',this.arealist[0])
-        this.setCurrentKey(this.arealist[0].sa_saleareaid)
-      }
-    })
+    // this.query_arealist(()=>{
+    //   if (this.noDefaultData === undefined) {
+    //     this.$emit('onClick',this.arealist[0])
+    //     this.setCurrentKey(this.arealist[0].sa_saleareaid)
+    //   }
+    // })
+    this.query_arealist(() => {})
   }
 }
 
@@ -109,7 +110,7 @@ export default {
 </style>
 <style scoped>
 .tree-panel{
-  padding: 16px;
+  padding: 0 16px 16px 16px;
   font-size: 14px;
   /* width:300px; */
   background: #FAFAFA;

src/HManagement/marketing/index.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="flex">
     <!-- 营销区域列表 -->
-    <areaTree ref="arealist" style="width:180px;flex:0 1 auto" @onClick="onClick">
-      <template v-slot:operation="data">
-        <!-- 新增区域 -->
-      <addArea v-if="tool.checkAuth($route.name,'insert')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
-      </template>
-    </areaTree>
+    <div style="display:flex;flex-direction: column;">
+      <div :class="['allData',{'active':active}]" @click="allClick">全部</div>
+      <areaTree ref="arealist" style="width:180px;flex:0 1 auto" @onClick="onClick">
+        <template v-slot:operation="data">
+          <!-- 新增区域 -->
+        <addArea v-if="tool.checkAuth($route.name,'insert')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addArea>
+        </template>
+      </areaTree>
+    </div>
+    
     <div class="hm-info-panel">
       <div class="container normal-panel normal-margin sticky">
         <!-- 编辑区域 -->
@@ -29,7 +33,7 @@
         <!-- 业务员信息 -->
         <saler v-show="activeName === 'first'" ref="saler" :data="areaInfo">
           <!-- 新建业务员 -->
-          <el-button v-if="tool.checkAuth($route.name,'saler_insert')" slot="add" size="small" type="primary" icon="el-icon-plus" @click="$router.push({path:'/add_saler',query:{id:areaInfo.sa_saleareaid,name:areaInfo.label}})">新 建</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'saler_insert')" slot="add" size="small" type="primary" icon="el-icon-plus" @click="$router.push({path:'/add_saler',query:{id:areaInfo.sa_saleareaid,name:areaInfo.label}})">添 加</el-button>
           <template v-slot:detail="scope">
             <el-button style="margin-right:10px" type="text" size="small" @click="$router.push({path:'/saler_detail',query:{id:scope.data.sa_salearea_hrid}})">详 情</el-button>
           </template>
@@ -41,7 +45,7 @@
         <!-- 经销商信息 -->
         <agent v-show="activeName === 'second'" ref="agent">
           <!-- 新建经销商 -->
-          <el-button v-if="tool.checkAuth($route.name,'agent_insert')" type="primary" size="small" slot="add" icon="el-icon-plus" @click="$router.push({path:'/add_agent',query:{area:areaInfo.label,id:areaInfo.sa_saleareaid}})">新 建</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'agent_insert')" type="primary" size="small" slot="add" icon="el-icon-plus" @click="$router.push({path:'/add_agent',query:{area:areaInfo.label,id:areaInfo.sa_saleareaid}})">添 加</el-button>
           <!-- 经销商详情 -->
           <template v-slot:detail="scope">
             <el-button type="text" size="small" @click="$router.push({path:'/agent_detail',query:{id:scope.data.sa_agentsid}})">详 情</el-button>
@@ -98,12 +102,30 @@ export default {
   data () {
     return {
       areaInfo:{},
-      activeName:'second'
+      activeName:'second',
+      active:false
     }
   },
+  mounted () {
+    this.allClick()
+  },
   methods:{
+    allClick () {
+      this.active = true
+      this.$refs.agent.param.content.isAll = 1
+      this.areaInfo = {}
+      this.$refs.agent.query_agent(1)
+
+      this.$refs.saler.param.content.isAll = 1
+      this.$refs.saler.query_saler(1)
+
+      this.$refs.arealist.setCurrentKey(null)
+    },
     onClick (data) {
+      this.active = false
       this.areaInfo = data
+      this.$refs.saler.param.content.isAll = null
+      this.$refs.agent.param.content.isAll = null
       this.$refs.saler.query_saler(this.areaInfo.sa_saleareaid)
       this.$refs.agent.query_agent(this.areaInfo.sa_saleareaid)
     },
@@ -143,6 +165,27 @@ export default {
   flex:1;
   width:500px;
   height:calc(100vh - 100px);
-  overflow-y:scroll
+  overflow-y:scroll;
+}
+.allData {
+  height: 26px;
+  line-height: 26px;
+  font-size: 14px;
+  cursor: pointer;
+  padding-left: 24px;
+  margin: 6px 0 6px 16px;
+  width: 131.2px;
+
+}
+.allData:hover {
+  background: #f5f7fa;
+}
+.active {
+  background: #4F7BFD !important;
+  border-radius: 3px;
+  color: #ffffff;
+  padding-left: 24px;
+  margin: 6px 0 6px 16px;
+  width: 131.2px;
 }
 </style>

src/SManagement/orderclue_detail/index.vue

@@ -116,36 +116,51 @@ export default {
       this.arealist = this.tool.createMenu(res.data)
     },
     async nullClick () {
-      let res = await this.$api.requested({
-        "classname": "saletool.orderclue.web.orderclue",
-        "method": "addFollowUpLog",
-        "content": {
-            "sat_orderclueid": this.$route.query.id,
-            "content": "无效处理",
-            "followupmode": "", //当面拜访、电话沟通
-            "logtype": "无效", //跟进、成交、丢单、无效
-            "competitor": ""
+      this.$alert('是否设置该线索为"失效"状态,确定后无法撤销', '提示', {
+        confirmButtonText: '确定',
+        callback: async action => {
+          if(action == 'confirm') {
+            let res = await this.$api.requested({
+              "classname": "saletool.orderclue.web.orderclue",
+              "method": "addFollowUpLog",
+              "content": {
+                  "sat_orderclueid": this.$route.query.id,
+                  "content": "无效处理",
+                  "followupmode": "", //当面拜访、电话沟通
+                  "logtype": "无效", //跟进、成交、丢单、无效
+                  "competitor": ""
+              }
+            })
+            this.tool.showMessage(res,() => {
+              this.getDetail()
+            })
+          }
         }
       })
-      this.tool.showMessage(res,() => {
-        this.getDetail()
-      })
     },
-    async successClick () {
-      let res = await this.$api.requested({
-        "classname": "saletool.orderclue.web.orderclue",
-        "method": "addFollowUpLog",
-        "content": {
-            "sat_orderclueid": this.$route.query.id,
-            "content": "已成交",
-            "followupmode": "", //当面拜访、电话沟通
-            "logtype": "成交", //跟进、成交、丢单、无效
-            "competitor": ""
+    successClick () {
+      this.$alert('是否设置该线索为"成交"状态,确定后无法撤销', '提示', {
+        confirmButtonText: '确定',
+        callback: async action => {
+          if(action == 'confirm') {
+            let res = await this.$api.requested({
+              "classname": "saletool.orderclue.web.orderclue",
+              "method": "addFollowUpLog",
+              "content": {
+                  "sat_orderclueid": this.$route.query.id,
+                  "content": "已成交",
+                  "followupmode": "", //当面拜访、电话沟通
+                  "logtype": "成交", //跟进、成交、丢单、无效
+                  "competitor": ""
+              }
+            })
+            this.tool.showMessage(res,() => {
+              this.getDetail()
+            })
+          }
         }
       })
-      this.tool.showMessage(res,() => {
-        this.getDetail()
-      })
+      
     }
   },
 };

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.30880ea4.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.24f47c86.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.0f41233e.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.fcee4508.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>