Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/customerManage/orderList.vue

@@ -72,10 +72,11 @@
                </p>
                <p class="CreateByName-text">引流人：{{item.CreateByName}}</p>
                <p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p>
-               <p>{{item.CreateTime}}</p>
-               <p class="CreateByName-text" v-if="item.OrderStatus == 5">完结：<span class="colorblue">{{item.FinishTime}}</span></p>
-               <p class="CreateByName-text" v-if="item.OrderStatus == 6">完结：<span class="colorblue">{{item.LossFinishTime}}</span></p>
+               <p class="CreateByName-text">{{item.CreateTime}}</p>
+               <p class="CreateByName-text" v-if="item.OrderStatus == 5">完结：<span>{{item.FinishTime}}</span></p>
+               <p class="CreateByName-text" v-if="item.OrderStatus == 6">完结：<span >{{item.LossFinishTime}}</span></p>
                <p class="CreateByName-text Commission cp" v-if="item.Commission" @click="commissionDetails(item)">提成：<span>{{item.Commission}}</span></p>
+               
               </td>
               <td style="border:none" min-width="6.5%">
                   <p class="colorblue font-color-link" 
@@ -1296,8 +1297,8 @@ export default {
     }
     .CreateByName-text.Commission {
         color: red;
-        margin-top: 10px;
-        margin-bottom: 0;
+        margin-top: 5px;
+        margin-bottom: 5px;
     }
     
     .colorblue {

src/components/dev/payroll.vue

@@ -144,7 +144,10 @@
                             <el-progress :text-inside="true" :stroke-width="20"
                               :percentage="setItemProgress(item)"
                               :status="setItemStatus(item)"
-                              :format="setItemTextW(item)">
+                              :format="setItemTextW(item)"
+                              :color="
+                              commissionratioList.AvgLureNum>item.StartValue&&
+                                commissionratioList.AvfOrderNum>item.EndValue?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
                               </el-progress>
                               <div class="rate-box" v-if="commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue">
@@ -168,7 +171,10 @@
                               <el-progress :text-inside="true" :stroke-width="20"
                               :percentage="setItemProgress(item)"
                               :status="setItemStatus(item)"
-                              :format="setItemText(item)">
+                              :format="setItemText(item)"
+                              :color="
+                              commissionratioList.AvgLureNum>item.StartValue&&
+                                commissionratioList.AvfOrderNum>item.EndValue?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
                               </el-progress>
                               <div class="rate-box" v-if="commissionratioList.AvgLureNum>item.StartValue&&
                                 commissionratioList.AvfOrderNum>item.EndValue">
@@ -223,6 +229,44 @@
                     pageSize: 10,
                     PeriodsId: -1
                 },
+                colors: [
+                    'rgba(42, 48, 54,.3)',
+                    'rgba(138, 24, 48,.3)',
+                    'rgba(200, 138, 131,.3)',
+                    'rgba(84, 221, 226,.3)',
+                    'rgba(178, 199, 168,.3)',
+                    'rgba(16, 195, 195,.3)',
+                    'rgba(0, 21, 68,.3)',
+                    'rgba(226, 166, 198,.3)',
+                    'rgba(278,17,66,.3)',
+                    'rgba(153, 199, 235,.3)',
+                    'rgba(34,184,221,.3)',
+                    'rgba(221,72,34,.3)',
+                    'rgba(204,51,204,.3)',
+                    'rgba(255,204,0,.3)',
+                    'rgba(77,179,179,.3)',
+                    'rgba(196,60,141,.3)',
+                    'rgba(195,90,141,.3)',
+                ],
+                colorlists: [
+                    'rgba(42, 48, 54, 1)',
+                    'rgba(138, 24, 48, 1)',
+                    'rgba(200, 138, 131, 1)',
+                    'rgba(84, 221, 226, 1)',
+                    'rgba(178, 199, 168, 1)',
+                    'rgba(16, 195, 195, 1)',
+                    'rgba(0, 21, 68, 1)',
+                    'rgba(226, 166, 198, 1)',
+                    'rgba(278,17,66, 1)',
+                    'rgba(153, 199, 235,1)',
+                    'rgba(34,184,221,1)',
+                    'rgba(221,72,34,1)',
+                    'rgba(204,51,204,1)',
+                    'rgba(255,204,0,1)',
+                    'rgba(77,179,179,1)',
+                    'rgba(196,60,141,1)',
+                    'rgba(195,90,141,1)',
+                ],
             }
         },
         mounted() {
@@ -241,7 +285,7 @@
                 if(this.commissionratioList.AvgLureNum>=data.StartValue&&this.commissionratioList.AvfOrderNum>=data.EndValue){
                     return 100
                 }else{
-                    return 0
+                    return 100
                 }
             },
             // 自定义进度条文字

src/components/dialogModel/sceneBox.vue

@@ -102,7 +102,7 @@
 </template>
 <script>
     export default {
-        props: ['LableType', 'sceneType', 'sceneDataList'],
+        props: ['LableType', 'sceneType', 'sceneDataList','erpOrderObj'],
         data() {
             return {
                 checked: false,
@@ -306,6 +306,11 @@
             }
         },
         mounted() {
+            if(this.erpOrderObj){
+                this.dataList.forEach(item=>{
+                    return item.SceneIndex = 5
+                })
+            }
             this.userInfo = this.getLocalStorage();
             this.GetSceneList()
             this.Employee()