Merge branch 'master' of http://gitlab.oytour.com/xiangwei/horse

src/pages/customerManage/customerSet/components/highSeas.vue → src/pages/customerManage/customerSet/components/CustomerLibrary.vue

@@ -49,33 +49,44 @@
         </q-card-section>
         <q-card-section>
           <div style="width:750px">
-            <q-item tag="label" v-ripple>
+            <q-item tag="label" >
               <q-item-section avatar top>
                 <q-radio v-model="LookRepeat" :val="1" color="primary" />
               </q-item-section>
               <q-item-section>
-                <div class="ruleset-title">全局查重 (一个客户在整个企业内，只允许被一个员工跟进)</div>
+                <div class="ruleset-title" style="color:#858598"><span style="color:#606266">全局查重</span> (一个客户在<span style="color:#f00">整个企业</span>内，只允许被一个员工跟进)</div>
                
                 <div class="ruleset-box">
                     <div class="ruleset-txt">
                          一个客户，在整个企业内查重（整个企业不允许创建重复客户） 
                     </div>
                     <div class="ruleset-img">
-                        <div class="ruleset-icon">
-                            <i class="iconfont icon-customer" style="font-size:38px"></i>
+                        <img src="@/assets/images/customer/customerSet/rule1.jpg"/>
                     </div>
+                </div>
+              </q-item-section>
+            </q-item>
+            <q-item tag="label" >
+              <q-item-section avatar top>
+                <q-radio v-model="LookRepeat" :val="2" color="primary" />
+              </q-item-section>
+              <q-item-section>
+                <div class="ruleset-title" style="color:#858598"><span style="color:#606266">客户库查重</span> (一个客户在<span style="color:#f00">单个客户库</span>内，只允许被一个员工跟进)</div>
                
-                        <div class="ruleset-img-center">
-                            
+                <div class="ruleset-box">
+                    <div class="ruleset-txt">
+                         一个客户，在整个企业内查重（整个企业不允许创建重复客户） 
                     </div>
+                    <div class="ruleset-img">
+                        <img src="@/assets/images/customer/customerSet/rule2.jpg"/>
                     </div>
                 </div>
               </q-item-section>
             </q-item>
           </div>
         </q-card-section>
-        <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn color="accent" unelevated label="确定" />
+        <q-card-actions align="left" class="bg-white text-teal">
+          <q-btn color="primary" unelevated label="确定" class="q-ml-lg" @click="setLookRepeatRule"/>
         </q-card-actions>
       </q-card>
     </q-dialog>
@@ -89,9 +100,8 @@
     toRefs,
     onMounted
   } from 'vue'
-  // import draggable from "vuedraggable";
   // import { Dialog } from 'quasar'
-  // import message from '@/utils/message'
+  import message from '@/utils/message'
   import customerSetService from '@/api/customerSet';
   // import router from '@/router/index'
 
@@ -152,19 +162,25 @@
       const LookRepeatMsg = reactive({ //查重规则 1客户库查重 2全局查重
         LookRepeat: 1
       })
-      const getLookRepeat = () => {
+      const getLookRepeatRule = () => {
         customerSetService.getCustomerLibraryLookRepeat({}).then(res => {
-          console.log(res.data.Data)
           LookRepeatMsg.LookRepeat = res.data.Data
         })
       }
+      const setLookRepeatRule = () => {
+        customerSetService.setCustomerLibraryLookRepeat(LookRepeatMsg).then(res => {
+          message.successMsg(res.data.Message)
+          data.showRuleDig=false
+        })
+      }
       onMounted(() => {
         getList()
-        getLookRepeat()
+        getLookRepeatRule()
       })
       return {
         ...toRefs(data),
         ...toRefs(LookRepeatMsg),
+        setLookRepeatRule
       }
     }
   })
@@ -179,7 +195,7 @@
     align-items: center;
     color: #333;
     padding: 30px 0 42px 0;
-    margin: 10px 0 35px 0px;
+    margin: 10px 0 ;
     border-radius: 8px;
     border: 1px solid #ccc;
     .ruleset-txt{
@@ -187,12 +203,8 @@
     }
     .ruleset-img{
         margin-top: 24px;
-        
-        .ruleset-icon{
-            text-align: center;
-            color: #91d170;
-            font-size: 33px;
-        }
+        display: flex;
+        justify-content: center;
     }
 }
 

src/pages/customerManage/customerSet/customerSetup.vue

@@ -16,7 +16,7 @@
         <q-tab name="clue" label="线索分配规则" />
         <q-tab name="phase" label="客户阶段" />
         <q-tab name="operation" label="客户操作" />
-        <q-tab name="seas" label="客户库-公海" />
+        <q-tab name="lib" label="客户库-公海" />
       </q-tabs>
       <div class="container fit">
         <businessModel v-if="tab == 'model'"></businessModel>
@@ -25,7 +25,7 @@
         <customer-phase v-if="tab == 'phase'"></customer-phase>
         <customerlabel v-if="tab == 'label'"></customerlabel>
         <CustomerOperation v-if="tab == 'operation'"></CustomerOperation>
-        <highSeas v-if="tab == 'seas'"></highSeas>
+        <CustomerLibrary v-if="tab == 'lib'"></CustomerLibrary>
       </div>
     </q-page>
   </div>
@@ -38,7 +38,7 @@ import clueRule from './components/clueRule.vue'
 import customerPhase from './components/customerPhase.vue'
 import customerlabel from './components/customerlabel.vue'
 import CustomerOperation from "./components/CustomerOperation.vue"
-import highSeas from "./components/highSeas.vue"
+import CustomerLibrary from "./components/CustomerLibrary.vue"
 import router from '@/router/index'
  import { useMeta } from 'quasar'
 import {
@@ -55,7 +55,7 @@ export default defineComponent({
     customerPhase,
     customerlabel,
     CustomerOperation,
-    highSeas,
+    CustomerLibrary,
   },
   setup() {
     useMeta({title: '客户设置'})

src/router/routes.ts

@@ -37,17 +37,17 @@ const routes: RouteRecordRaw[] = [
   // 编辑规则
   {
     path: '/editor/editRule',
-    component: () => import('@/pages/editor/editRule.vue')
+    component: () => import('@/pages/customerManage/editor/editRule.vue')
   },
   // 编辑阶段规则
   {
     path: '/editor/manageStageRange',
-    component: () => import('@/pages/editor/manageStageRange.vue')
+    component: () => import('@/pages/customerManage/editor/manageStageRange.vue')
   },
   // 创建阶段
   {
     path: '/editor/createStageRange',
-    component: () => import('@/pages/editor/createStageRange.vue')
+    component: () => import('@/pages/customerManage/editor/createStageRange.vue')
   },
 
   {