Parcourir la source

e订单,数据统计状态样式调整,部分操作栏样式调整

qymljy il y a 1 an
Parent
commit
2664c8c1ee
45 fichiers modifiés avec 368 ajouts et 197 suppressions
  1. 4 4
      src/HDrpManagement/afterSalesmag/index.vue
  2. 8 8
      src/HDrpManagement/afterSalesmag/modules/detail.vue
  3. 4 4
      src/HDrpManagement/aftersalesBill/index.vue
  4. 8 8
      src/HDrpManagement/aftersalesBill/modules/detail.vue
  5. 1 1
      src/HDrpManagement/collectionRule/modules/table.vue
  6. 7 5
      src/HDrpManagement/customerPortrait/index.vue
  7. 5 5
      src/HDrpManagement/dispatch/details/index.vue
  8. 4 4
      src/HDrpManagement/dispatch/index.vue
  9. 4 6
      src/HDrpManagement/dispatch/modules/defaultInfo.vue
  10. 3 3
      src/HDrpManagement/logistics/details/index.vue
  11. 3 3
      src/HDrpManagement/logistics/index.vue
  12. 3 5
      src/HDrpManagement/logistics/modules/defaultInfo.vue
  13. 6 6
      src/HDrpManagement/numberManage/index.vue
  14. 62 14
      src/HDrpManagement/numberManage/modules/detail.vue
  15. 9 4
      src/HDrpManagement/projectPortrait/index.vue
  16. 1 1
      src/HDrpManagement/salerPortrait/index.vue
  17. 18 5
      src/HDrpManagement/serveBill/index.vue
  18. 49 12
      src/HDrpManagement/serveBill/modules/detail.vue
  19. 18 13
      src/HDrpManagement/serveBillMag/index.vue
  20. 71 10
      src/HDrpManagement/serveBillMag/modules/detail.vue
  21. 6 6
      src/HDrpManagement/serveWorkBill/index.vue
  22. 10 10
      src/HDrpManagement/serveWorkBill/modules/detail.vue
  23. 6 6
      src/HDrpManagement/toolBill/index.vue
  24. 8 8
      src/HDrpManagement/toolBill/modules/detail.vue
  25. 5 5
      src/HDrpManagement/toolBillMag/index.vue
  26. 8 8
      src/HDrpManagement/toolBillMag/modules/detail.vue
  27. 1 1
      src/HManagement/archives_ad/archives_adclass/modules/delete.vue
  28. 1 1
      src/HManagement/archives_ad/modules/delete.vue
  29. 2 2
      src/HManagement/archives_ad/modules/release.vue
  30. 1 1
      src/HManagement/ecycle/modules/delData.vue
  31. 1 1
      src/HManagement/ecycle/modules/recovery.vue
  32. 1 1
      src/HManagement/notice/list/modules/message.vue
  33. 1 0
      src/HManagement/siteManage/tagManage/index.vue
  34. 4 4
      src/SDrpManagement/commissionDistribution/detail/index.vue
  35. 1 1
      src/SDrpManagement/commissionDistribution/index.vue
  36. 1 1
      src/SDrpManagement/salerAccount/index.vue
  37. 1 1
      src/SDrpManagement/salerAccount/modules/detail.vue
  38. 4 4
      src/SDrpManagement/salerExpenditure/detail/index.vue
  39. 1 1
      src/SDrpManagement/salerExpenditure/index.vue
  40. 4 4
      src/SDrpManagement/salerIncome/detail/index.vue
  41. 3 3
      src/SDrpManagement/salerIncome/index.vue
  42. 2 0
      src/components/delete_btn/index.vue
  43. 1 1
      src/components/newLayout/index.vue
  44. 2 2
      src/router/HDrpManagement.js
  45. 5 4
      src/views/mediaStatistics/modules/salesfunnel.vue

+ 4 - 4
src/HDrpManagement/afterSalesmag/index.vue

@@ -51,10 +51,10 @@
       </template>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#f56c6c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </span>
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>

+ 8 - 8
src/HDrpManagement/afterSalesmag/modules/detail.vue

@@ -163,16 +163,16 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '新建':
-                style = {color:'#000000'}
+                style = {color:'#3874F6'}
                 break;
               case '提交':
-                style = {color:'#d90a0a'}
+                style = {color:'#67C23A'}
                 break;
               case '审核':
-                style = {color:'#52C41A'}
+                style = {color:'#e6a23c'}
                 break;
               case '复核':
-                style = {color:'#3874f6'}
+                style = {color:'#f56c6c'}
                 break;
             }
             return style
@@ -236,16 +236,16 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '新建':
-                style = {color:'#000000'}
+                style = {color:'#3874F6'}
                 break;
               case '提交':
-                style = {color:'#d90a0a'}
+                style = {color:'#67C23A'}
                 break;
               case '审核':
-                style = {color:'#52C41A'}
+                style = {color:'#e6a23c'}
                 break;
               case '复核':
-                style = {color:'#3874f6'}
+                style = {color:'#f56c6c'}
                 break;
               }
               return style

+ 4 - 4
src/HDrpManagement/aftersalesBill/index.vue

@@ -44,10 +44,10 @@
       </template>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#f56c6c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </span>
         <div v-else-if="scope.data.column.columnname == 'isitemreturn'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>

+ 8 - 8
src/HDrpManagement/aftersalesBill/modules/detail.vue

@@ -124,16 +124,16 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '新建':
-                style = {color:'#000000'}
+                style = {color:'#3874F6'}
                 break;
               case '提交':
-                style = {color:'#d90a0a'}
+                style = {color:'#67C23A'}
                 break;
               case '审核':
-                style = {color:'#52C41A'}
+                style = {color:'#e6a23c'}
                 break;
               case '复核':
-                style = {color:'#3874f6'}
+                style = {color:'#f56c6c'}
                 break;
             }
             return style
@@ -197,16 +197,16 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '新建':
-                style = {color:'#000000'}
+                style = {color:'#3874F6'}
                 break;
               case '提交':
-                style = {color:'#d90a0a'}
+                style = {color:'#67C23A'}
                 break;
               case '审核':
-                style = {color:'#52C41A'}
+                style = {color:'#e6a23c'}
                 break;
               case '复核':
-                style = {color:'#3874f6'}
+                style = {color:'#f56c6c'}
                 break;
             }
             return style

+ 1 - 1
src/HDrpManagement/collectionRule/modules/table.vue

@@ -218,7 +218,7 @@
        <template slot-scope="scope">
 <!--         <el-button type="text" size="mini" @click="goDetail(scope.row)">{{$t('详 情')}}</el-button>-->
          <edit :data="scope.row" class="inline-16" @onSuccess="onSuccess"></edit>
-         <el-button :disabled="scope.row.isdefault === 1" size="mini" v-if="tool.checkAuth($route.name,'delete')" type="text" @click="onDel(scope.row.sa_receivableruleid)">{{$t('删 除')}}</el-button>
+         <el-button :disabled="scope.row.isdefault === 1" size="mini" v-if="tool.checkAuth($route.name,'delete')" type="text" @click="onDel(scope.row.sa_receivableruleid)" style="color: #f56c6c">{{$t('删 除')}}</el-button>
        </template>
       </el-table-column>
   </el-table>

+ 7 - 5
src/HDrpManagement/customerPortrait/index.vue

@@ -121,13 +121,15 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
-          <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'grade'">
           {{ grade(scope.data.column.data.grade) }}

+ 5 - 5
src/HDrpManagement/dispatch/details/index.vue

@@ -99,24 +99,24 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'状态',
-            value:this.$t(this.mainData.status),
+            value:this.$t(this.mainData.STATUS),
             style:function () {
               let style = {}
               switch (that.mainData.STATUS) {
                 case '新建':
-                  style = {color:"#000000"}
+                  style = {color:"#3874f6"}
                   break;
                 case '提交':
                   style = {color:"#d90a0a"}
                   break;
                 case '审核':
-                  style = {color:"#52C41A"}
+                  style = {color:"#e6a23c"}
                   break;
                 case '复核':
-                  style = {color:"#3874f6"}
+                  style = {color:"#e6a23c"}
                   break;
                 case '关闭':
-                  style = {color:"#b2c0ea"}
+                  style = {color:"#ccc"}
                   break;
                 default:
                   break;

+ 4 - 4
src/HDrpManagement/dispatch/index.vue

@@ -40,11 +40,11 @@
         </template>
         <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname == 'STATUS'">
-            <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
             <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           </div>
           <div v-else-if="scope.data.column.columnname == 'sumamount'">
             {{ scope.data.column.data.sumamount ? tool.formatAmount(scope.data.column.data.sumamount,2) : '--' }}

+ 4 - 6
src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -54,26 +54,24 @@ export default {
       let style = {}
       switch (val) {
         case '新建':
-          style = {color:"#000000"}
+          style = {color:"#3874f6"}
           break;
         case '提交':
           style = {color:"#d90a0a"}
           break;
         case '审核':
-          style = {color:"#52C41A"}
+          style = {color:"#e6a23c"}
           break;
         case '复核':
-          style = {color:"#3874f6"}
+          style = {color:"#e6a23c"}
           break;
         case '关闭':
-          style = {color:"#b2c0ea"}
+          style = {color:"#ccc"}
           break;
         default:
           break;
       }
-      console.log(style)
       this.colorStyle.color = style.color
-      console.log(this.colorStyle,"1111")
       return style
 
     }

+ 3 - 3
src/HDrpManagement/logistics/details/index.vue

@@ -133,13 +133,13 @@
               let style = {}
               switch (that.mainData.status) {
                 case '新建':
-                  style = {color:"#000000"}
+                  style = {color:"#3874F6"}
                   break;
                 case '审核':
-                  style = {color:"#d90a0a"}
+                  style = {color:"#e6a23c"}
                   break;
                 case '收货':
-                  style = {color:"#52C41A"}
+                  style = {color:"#67C23A"}
                   break;
                 default:
                   break;

+ 3 - 3
src/HDrpManagement/logistics/index.vue

@@ -45,9 +45,9 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '收货'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '收货'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

+ 3 - 5
src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -51,20 +51,18 @@ export default {
       console.log(val,'执行了')
       switch (val) {
         case '新建':
-          style = {color:'#000000'}
+          style = {color:'#3874F6'}
           break;
         case '审核':
-          style = {color:'#d90a0a'}
+          style = {color:'#e6a23c'}
           break;
         case '收货':
-          style = {color:'#52C41A'}
+          style = {color:'#67C23A'}
           break;
         default:
           break;
       }
-      console.log(style)
       this.colorStyle.color = style.color
-      console.log(this.colorStyle,"1111")
       return style
 
     }

+ 6 - 6
src/HDrpManagement/numberManage/index.vue

@@ -38,16 +38,16 @@
       </div>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '在库'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '借出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '售出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#b2c0ea" v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '在库'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '借出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '售出'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#cccccc" v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </span>
         <div v-else-if="scope.data.column.columnname == 'islimit'">
-          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]]?'#67C23A':'#cccccc'}">{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'isused'">
-          <span>{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]]?'#67C23A':'#cccccc'}">{{scope.data.column.data[[scope.data.column.columnname]] ? $t('是') : $t('否')}}</span>
         </div>
         <span v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

+ 62 - 14
src/HDrpManagement/numberManage/modules/detail.vue

@@ -53,7 +53,7 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData);
-      
+
       this.changeDataStructure()
     },
     changeDataStructure() {
@@ -77,7 +77,19 @@ export default {
         },
         {
           label:'是否限制使用',
-          value:this.mainData.islimit ? this.$t('是'):this.$t('否')
+          value:this.mainData.islimit ? this.$t('是'):this.$t('否'),
+          style:function () {
+            let style = {}
+            switch (that.mainData.islimit) {
+              case 1:
+                style = {color:"#67C23A"}
+                break;
+              default:
+                style = {color:"#cccccc"}
+                break;
+            }
+            return style
+          }
         },
         {
           label:'状态',
@@ -86,16 +98,16 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '在库':
-                style = {color:"#000000"}
+                style = {color:"#3874F6"}
                 break;
               case '借出':
-                style = {color:"#d90a0a"}
+                style = {color:"#e6a23c"}
                 break;
               case '售出':
-                style = {color:"#52C41A"}
+                style = {color:"#67C23A"}
                 break;
               case '报废':
-                style = {color:"#b2c0ea"}
+                style = {color:"#cccccc"}
                 break;
               default:
                 break;
@@ -109,7 +121,19 @@ export default {
         },
         {
           label:'是否使用',
-          value:this.mainData.isused ? this.$t('是'):this.$t('否')
+          value:this.mainData.isused ? this.$t('是'):this.$t('否'),
+          style:function () {
+            let style = {}
+            switch (that.mainData.isused) {
+              case 1:
+                style = {color:"#67C23A"}
+                break;
+              default:
+                style = {color:"#cccccc"}
+                break;
+            }
+            return style
+          }
         },
       ]
       this.detailInfo = {
@@ -128,7 +152,19 @@ export default {
           },
           {
             label:'是否限制使用',
-            value:this.mainData.islimit ? this.$t('是'):this.$t('否')
+            value:this.mainData.islimit ? this.$t('是'):this.$t('否'),
+            style:function () {
+              let style = {}
+              switch (that.mainData.islimit) {
+                case 1:
+                  style = {color:"#67C23A"}
+                  break;
+                default:
+                  style = {color:"#cccccc"}
+                  break;
+              }
+              return style
+            }
           },
           {
             label:'序列号',
@@ -145,16 +181,16 @@ export default {
               let style = {}
               switch (that.mainData.status) {
                 case '在库':
-                  style = {color:"#000000"}
+                  style = {color:"#3874F6"}
                   break;
                 case '借出':
-                  style = {color:"#d90a0a"}
+                  style = {color:"#e6a23c"}
                   break;
                 case '售出':
-                  style = {color:"#52C41A"}
+                  style = {color:"#67C23A"}
                   break;
                 case '报废':
-                  style = {color:"#b2c0ea"}
+                  style = {color:"#cccccc"}
                   break;
                 default:
                   break;
@@ -168,7 +204,19 @@ export default {
           },
           {
             label:'是否使用',
-            value:this.mainData.isused ? this.$t('是'):this.$t('否')
+            value:this.mainData.isused ? this.$t('是'):this.$t('否'),
+            style:function () {
+              let style = {}
+              switch (that.mainData.isused) {
+                case 1:
+                  style = {color:"#67C23A"}
+                  break;
+                default:
+                  style = {color:"#cccccc"}
+                  break;
+              }
+              return style
+            }
           },
         ],
         systemInfo: [
@@ -202,4 +250,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 9 - 4
src/HDrpManagement/projectPortrait/index.vue

@@ -135,10 +135,11 @@
           <el-tag v-for="(item,index) in scope.data.column.data.sys_tag" size="mini" style="margin-right:10px" :key="index">{{ $t(item) }}</el-tag>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
-          <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已结束'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#f56c6c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已结案'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'industry'">
           <el-tag v-for="(item,index) in scope.data.column.data.industry" size="mini" style="margin-right:10px" :key="index">{{ $t(item) }}</el-tag>
@@ -247,6 +248,10 @@ export default {
         {
           value:"已失败",
           label:"已失败"
+        },
+        {
+          value:"已结案",
+          label:"已结案"
         }
       ]
     }

+ 1 - 1
src/HDrpManagement/salerPortrait/index.vue

@@ -70,7 +70,7 @@
           {{ grade(scope.data.column.data.grade) }}
         </div>
         <p v-else-if="scope.data.column.columnname === 'status'">
-          <span :style="{color:scope.data.column.data.status == '0'?'#52c41a':''}">{{scope.data.column.data.status == '0'?'在职':'离职'}}</span>
+          <span :style="{color:scope.data.column.data.status == '0'?'#67c23a':'#cccccc'}">{{scope.data.column.data.status == '0'?'在职':'离职'}}</span>
         </p>
         <div v-else-if="scope.data.column.columnname === 'discountrate'">
           {{ Math.round((scope.data.column.data.discountrate * 100)*100)/100 +'%' }}

+ 18 - 5
src/HDrpManagement/serveBill/index.vue

@@ -51,14 +51,18 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
-          <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '进行中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待处理'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#e6a23c" v-if="scope.data.column.data[[scope.data.column.columnname]] == '进行中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#f56c6c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待处理'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待指派'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待指派'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'servicetype'" :style="colorSet(scope.data.column.data[[scope.data.column.columnname]])">
+          {{
+            $t(scope.data.column.data[[scope.data.column.columnname]])
+          }}
+        </div>
         <div v-else-if="scope.data.column.columnname == 'province'">
           {{ `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}` }}
         </div>
@@ -102,6 +106,15 @@ export default {
       }
       this.$refs.list.param.content.where = this.where
       this.$refs.list.listData()
+    },
+    colorSet(data){
+      let style = {
+        "售前":{color:'#3874f6'},
+        "售中":{color:'#e6a23c'},
+        "售后":{color:'#67c23a'},
+        "历史售后":{color:'#999'},
+      }[data]
+      return style
     }
   }
 }

+ 49 - 12
src/HDrpManagement/serveBill/modules/detail.vue

@@ -187,22 +187,19 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "进行中":
-                style = { color: "#52c41a" };
+                style = { color: "#e6a23c" };
                 break;
               case "待处理":
-                style = { color: "#3874f6" };
+                style = { color: "f56c6c" };
                 break;
               case "新建":
                 style = { color: "#333333" };
                 break;
-              case "提交":
-                style = { color: "#3874f6" };
-                break;
               case "待指派":
-                style = { color: "#fa8c16" };
+                style = { color: "#3874F6" };
                 break;
               case "已完成":
-                style = { color: "#000000" };
+                style = { color: "#67C23A" };
                 break;
               default:
                 break;
@@ -240,6 +237,26 @@ export default {
         {
           label: "服务分类",
           value: this.mainData.servicetype ? this.mainData.servicetype : "",
+          style:function () {
+            let style = {}
+            switch (that.mainData.servicetype) {
+              case '售前':
+                style = {color:'#3874f6'}
+                break;
+              case '售中':
+                style = {color:'#e6a23c'}
+                break;
+              case '售后':
+                style = {color:'#67c23a'}
+                break;
+              case '历史售后':
+                style = {color:'#999'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label: "应用系统",
@@ -288,10 +305,10 @@ export default {
                 let style = {};
                 switch (that.mainData.status) {
                   case "进行中":
-                    style = { color: "#52c41a" };
+                    style = { color: "#e6a23c" };
                     break;
                   case "待处理":
-                    style = { color: "#3874f6" };
+                    style = { color: "#f56c6c" };
                     break;
                   case "新建":
                     style = { color: "#333333" };
@@ -300,10 +317,10 @@ export default {
                     style = { color: "#3874f6" };
                     break;
                   case "待指派":
-                    style = { color: "#fa8c16" };
+                    style = { color: "#3874F6" };
                     break;
                   case "已完成":
-                    style = { color: "#000000" };
+                    style = { color: "#67C23A" };
                     break;
                   default:
                     break;
@@ -318,7 +335,27 @@ export default {
               value: `${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`,
             },
             { label: "关联订单", value: this.mainData.sonum },
-            { label: "服务分类", value: this.mainData.servicetype },
+            { label: "服务分类", value: this.mainData.servicetype,
+              style:function () {
+                let style = {}
+                switch (that.mainData.servicetype) {
+                  case '售前':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '售中':
+                    style = {color:'#e6a23c'}
+                    break;
+                  case '售后':
+                    style = {color:'#67c23a'}
+                    break;
+                  case '历史售后':
+                    style = {color:'#999'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+              }},
             { label: "现场联系人", value: this.mainData.scenecontact },
             { label: "身份备注", value: this.mainData.scenecontactrole },
             {

+ 18 - 13
src/HDrpManagement/serveBillMag/index.vue

@@ -71,7 +71,7 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span
-            style="color: #52c41a"
+            style="color: #e6a23c"
             v-if="
               scope.data.column.data[[scope.data.column.columnname]] == '进行中'
             "
@@ -80,7 +80,7 @@
             }}</span
           >
           <span
-            style="color: #3874f6"
+            style="color: #f56c6c"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '待处理'
             "
@@ -98,16 +98,7 @@
             }}</span
           >
           <span
-            style="color: #3874f6"
-            v-else-if="
-              scope.data.column.data[[scope.data.column.columnname]] == '提交'
-            "
-            >{{
-              $t(scope.data.column.data[[scope.data.column.columnname]])
-            }}</span
-          >
-          <span
-            style="color: #fa8c16"
+            style="color: #3874F6"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '待指派'
             "
@@ -116,7 +107,7 @@
             }}</span
           >
           <span
-            style="color: #000000"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '已完成'
             "
@@ -133,6 +124,11 @@
             `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`
           }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'servicetype'" :style="colorSet(scope.data.column.data[[scope.data.column.columnname]])">
+          {{
+            $t(scope.data.column.data[[scope.data.column.columnname]])
+          }}
+        </div>
         <div v-else>
           {{
             scope.data.column.data[[scope.data.column.columnname]]
@@ -177,6 +173,15 @@ export default {
       this.$refs.list.param.content.where = this.where;
       this.$refs.list.listData();
     },
+    colorSet(data){
+      let style = {
+        "售前":{color:'#3874f6'},
+        "售中":{color:'#e6a23c'},
+        "售后":{color:'#67c23a'},
+        "历史售后":{color:'#999'},
+      }[data]
+      return style
+    }
   },
 };
 </script>

+ 71 - 10
src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -120,22 +120,19 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '进行中':
-                style = {color:'#52c41a'}
+                style = {color:'#e6a23c'}
                 break;
               case '待处理':
-                style = {color:'#3874f6'}
+                style = {color:'#f56c6c'}
                 break;
               case '新建':
                 style = {color:'#333333'}
                 break;
-              case '提交':
-                style = {color:'#3874f6'}
-                break;
               case '待指派':
-                style = {color:'#fa8c16'}
+                style = {color:'#3874F6'}
                 break;
               case '已完成':
-                style = {color:'#fa8c16'}
+                style = {color:'#67C23A'}
                 break;
               default:
                 break;
@@ -149,7 +146,27 @@ export default {
         {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
         {label:'地址',value:this.mainData.address ? this.mainData.address : ''},
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
-        {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : ''},
+        {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : '',
+          style:function () {
+            let style = {}
+            switch (that.mainData.servicetype) {
+              case '售前':
+                style = {color:'#3874f6'}
+                break;
+              case '售中':
+                style = {color:'#e6a23c'}
+                break;
+              case '售后':
+                style = {color:'#67c23a'}
+                break;
+              case '历史售后':
+                style = {color:'#999'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }},
         {label:'现场联系人',value:this.mainData.scenecontact ? this.mainData.scenecontact : ''},
         {label:'身份备注',value:this.mainData.scenecontactrole ? this.mainData.scenecontactrole : ''},
         {label:'现场联系人手机号',value:this.mainData.scenecontactphonenumber ? this.mainData.scenecontactphonenumber : ''},
@@ -170,12 +187,56 @@ export default {
           info: [
             {label:'单号',value:this.mainData.billno},
             {label:'单据日期',value:this.mainData.billdate},
-            {label:'状态',value:this.$t(this.mainData.status)},
+            {label:'状态',value:this.$t(this.mainData.status),
+              style:function () {
+                let style = {}
+                switch (that.mainData.status) {
+                  case '进行中':
+                    style = {color:'#e6a23c'}
+                    break;
+                  case '待处理':
+                    style = {color:'#f56c6c'}
+                    break;
+                  case '新建':
+                    style = {color:'#333333'}
+                    break;
+                  case '待指派':
+                    style = {color:'#3874F6'}
+                    break;
+                  case '已完成':
+                    style = {color:'#67C23A'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+
+              }},
             {label:'企业编号',value:this.mainData.agentnum},
             {label:'企业名称',value:this.mainData.enterprisename},
             {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
             {label:'关联订单',value:this.mainData.sonum},
-            {label:'服务分类',value:this.mainData.servicetype},
+            {label:'服务分类',value:this.mainData.servicetype,
+              style:function () {
+                let style = {}
+                switch (that.mainData.servicetype) {
+                  case '售前':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '售中':
+                    style = {color:'#e6a23c'}
+                    break;
+                  case '售后':
+                    style = {color:'#67c23a'}
+                    break;
+                  case '历史售后':
+                    style = {color:'#999'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+              }},
             {label:'现场联系人',value:this.mainData.scenecontact},
             {label:'身份备注',value:this.mainData.scenecontactrole},
             {label:'现场联系人手机号',value:this.mainData.scenecontactphonenumber},

+ 6 - 6
src/HDrpManagement/serveWorkBill/index.vue

@@ -51,7 +51,7 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span
-            style="color: #52c41a"
+            style="color: #e6a23c"
             v-if="
               scope.data.column.data[[scope.data.column.columnname]] == '进行中'
             "
@@ -60,7 +60,7 @@
             }}</span
           >
           <span
-            style="color: #3874f6"
+            style="color: #3874F6"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '待开始'
             "
@@ -69,7 +69,7 @@
             }}</span
           >
           <span
-            style="color: #333333"
+            style="color: #f56c6c"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '暂停'
             "
@@ -79,7 +79,7 @@
           >
           <!--          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>-->
           <span
-            style="color: #fa8c16"
+            style="color: #999999"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '待接单'
             "
@@ -88,7 +88,7 @@
             }}</span
           >
           <span
-            style="color: #fa8c16"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '已完成'
             "
@@ -156,4 +156,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

+ 10 - 10
src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -281,22 +281,22 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "进行中":
-                style = { color: "#52c41a" };
+                style = { color: "#e6a23c" };
                 break;
               case "待开始":
-                style = { color: "#3874f6" };
+                style = { color: "#3874F6" };
                 break;
               case "暂停":
-                style = { color: "#333333" };
+                style = { color: "#f56c6c" };
                 break;
               /* case '提交':
                 style = {color:'#3874f6'}
                 break; */
               case "待接单":
-                style = { color: "#fa8c16" };
+                style = { color: "#999999" };
                 break;
               case "已完成":
-                style = { color: "#fa8c16" };
+                style = { color: "#67C23A" };
                 break;
               default:
                 break;
@@ -355,22 +355,22 @@ export default {
                 let style = {};
                 switch (that.mainData.status) {
                   case "进行中":
-                    style = { color: "#52c41a" };
+                    style = { color: "#e6a23c" };
                     break;
                   case "待开始":
-                    style = { color: "#3874f6" };
+                    style = { color: "#3874F6" };
                     break;
                   case "暂停":
-                    style = { color: "#333333" };
+                    style = { color: "#f56c6c" };
                     break;
                   /* case '提交':
                        style = {color:'#3874f6'}
                        break; */
                   case "待接单":
-                    style = { color: "#fa8c16" };
+                    style = { color: "#999999" };
                     break;
                   case "已完成":
-                    style = { color: "#fa8c16" };
+                    style = { color: "#67C23A" };
                     break;
                   default:
                     break;

+ 6 - 6
src/HDrpManagement/toolBill/index.vue

@@ -62,7 +62,7 @@
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
           <span
-            style="color: #000000"
+            style="color: #3874F6"
             v-if="
               scope.data.column.data[[scope.data.column.columnname]] == '新建'
             "
@@ -71,7 +71,7 @@
             }}</span
           >
           <span
-            style="color: #d90a0a"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '提交'
             "
@@ -80,7 +80,7 @@
             }}</span
           >
           <span
-            style="color: #52c41a"
+            style="color: #e6a23c"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '审核'
             "
@@ -89,9 +89,9 @@
             }}</span
           >
           <span
-            style="color: #3874f6"
+            style="color: #f56c6c"
             v-else-if="
-              scope.data.column.data[[scope.data.column.columnname]] == '核'
+              scope.data.column.data[[scope.data.column.columnname]] == '核'
             "
             >{{
               $t(scope.data.column.data[[scope.data.column.columnname]])
@@ -154,4 +154,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

+ 8 - 8
src/HDrpManagement/toolBill/modules/detail.vue

@@ -165,16 +165,16 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "新建":
-                style = { color: "#000000" };
+                style = { color: "#3874F6" };
                 break;
               case "提交":
-                style = { color: "#d90a0a" };
+                style = { color: "#67C23A" };
                 break;
               case "审核":
-                style = { color: "#52C41A" };
+                style = { color: "#e6a23c" };
                 break;
               case "复核":
-                style = { color: "#3874f6" };
+                style = { color: "#f56c6c" };
                 break;
             }
             return style;
@@ -238,16 +238,16 @@ export default {
               let style = {};
               switch (that.mainData.status) {
                 case "新建":
-                  style = { color: "#000000" };
+                  style = { color: "#3874F6" };
                   break;
                 case "提交":
-                  style = { color: "#d90a0a" };
+                  style = { color: "#67C23A" };
                   break;
                 case "审核":
-                  style = { color: "#52C41A" };
+                  style = { color: "#e6a23c" };
                   break;
                 case "复核":
-                  style = { color: "#3874f6" };
+                  style = { color: "#f56c6c" };
                   break;
               }
               return style;

+ 5 - 5
src/HDrpManagement/toolBillMag/index.vue

@@ -63,7 +63,7 @@
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
           <span
-            style="color: #000000"
+            style="color: #3874F6"
             v-if="
               scope.data.column.data[[scope.data.column.columnname]] == '新建'
             "
@@ -72,7 +72,7 @@
             }}</span
           >
           <span
-            style="color: #d90a0a"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '提交'
             "
@@ -81,7 +81,7 @@
             }}</span
           >
           <span
-            style="color: #52c41a"
+            style="color: #e6a23c"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '审核'
             "
@@ -90,7 +90,7 @@
             }}</span
           >
           <span
-            style="color: #3874f6"
+            style="color: #f56c6c"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '复核'
             "
@@ -158,4 +158,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

+ 8 - 8
src/HDrpManagement/toolBillMag/modules/detail.vue

@@ -201,16 +201,16 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "新建":
-                style = { color: "#000000" };
+                style = { color: "#3874F6" };
                 break;
               case "提交":
-                style = { color: "#d90a0a" };
+                style = { color: "#67C23A" };
                 break;
               case "审核":
-                style = { color: "#52C41A" };
+                style = { color: "#e6a23c" };
                 break;
               case "复核":
-                style = { color: "#3874f6" };
+                style = { color: "#f56c6c" };
                 break;
             }
             return style;
@@ -274,16 +274,16 @@ export default {
               let style = {};
               switch (that.mainData.status) {
                 case "新建":
-                  style = { color: "#000000" };
+                  style = { color: "#3874F6" };
                   break;
                 case "提交":
-                  style = { color: "#d90a0a" };
+                  style = { color: "#67C23A" };
                   break;
                 case "审核":
-                  style = { color: "#52C41A" };
+                  style = { color: "#e6a23c" };
                   break;
                 case "复核":
-                  style = { color: "#3874f6" };
+                  style = { color: "#f56c6c" };
                   break;
               }
               return style;

+ 1 - 1
src/HManagement/archives_ad/archives_adclass/modules/delete.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button slot="reference" size="small" type="text" @click="open">{{$t('删除')}}</el-button>
+  <el-button slot="reference" size="small" type="text" @click="open" style="color: #f56c6c">{{$t('删除')}}</el-button>
 </template>
 
 <script>

+ 1 - 1
src/HManagement/archives_ad/modules/delete.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display:inline">
-    <el-button slot="reference" size="small" type="text" :disabled="disabled" @click="open">{{$t('删 除')}}</el-button>
+    <el-button slot="reference" size="small" type="text" :disabled="disabled" @click="open" :style="{color:disabled?'':'#f56c6c'}">{{$t('删 除')}}</el-button>
   </div>
 </template>
 

+ 2 - 2
src/HManagement/archives_ad/modules/release.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button type="text" size="mini" @click="releaseNotice">{{data.status === '新建'?$t('发布'):$t('取消发布')}}</el-button>
+    <el-button type="text" size="mini" @click="releaseNotice" :style="{color:data.status === '新建'?'#67c23a':'#e6a23c'}">{{data.status === '新建'?$t('发布'):$t('取消发布')}}</el-button>
   </div>
 </template>
 
@@ -25,4 +25,4 @@ export default {
     }
   }
 }
-</script>
+</script>

+ 1 - 1
src/HManagement/ecycle/modules/delData.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="onshow" :disabled="!tool.checkAuth($route.name,'delData')">{{$t('删 除')}}</el-button>
+    <el-button type="text" size="mini" @click="onshow" :disabled="!tool.checkAuth($route.name,'delData')" style="color: #f56c6c">{{$t('删 除')}}</el-button>
   </div>
 </template>
 

+ 1 - 1
src/HManagement/ecycle/modules/recovery.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="queryRule" :disabled="!tool.checkAuth($route.name,'recovery')">{{$t('恢 复')}}</el-button>
+    <el-button type="text" size="mini" @click="queryRule" :disabled="!tool.checkAuth($route.name,'recovery')" style="color: #67C23A">{{$t('恢 复')}}</el-button>
     <el-dialog :title="$t('重复客户')" :visible.sync="dialogTableVisible" append-to-body width="1000px" @close="onClose">
       <div slot="title" class="dialog-title">
         <span class="title-text">{{type === '客户'?$t('重复客户'):$t('重复项目')}}</span>

+ 1 - 1
src/HManagement/notice/list/modules/message.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="query_message()">{{$t('查看留言')}}</el-button>
+    <el-button type="text" size="mini" @click="query_message()" style="color: #67C23A">{{$t('查看留言')}}</el-button>
     <el-drawer
         title="查看留言"
         :visible.sync="dialogTableVisible"

+ 1 - 0
src/HManagement/siteManage/tagManage/index.vue

@@ -82,6 +82,7 @@
             tool.checkAuth($route.name, 'delete') &&
             scope.data.data.issystem == 0
           "
+          style="color: #f56c6c"
           @click="deleteRow(scope.data.data)"
           >{{ $t(`删 除`) }}</el-button
         >

+ 4 - 4
src/SDrpManagement/commissionDistribution/detail/index.vue

@@ -81,10 +81,10 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "新建":
-                style = { color: "#333333" };
+                style = { color: "#3874f6" };
                 break;
               case "发放":
-                style = { color: "#52c41a" };
+                style = { color: "#67c23a" };
                 break;
               default:
                 break;
@@ -133,10 +133,10 @@ export default {
               let style = {};
               switch (that.mainData.status) {
                 case "新建":
-                  style = { color: "#333333" };
+                  style = { color: "#3874f6" };
                   break;
                 case "发放":
-                  style = { color: "#52c41a" };
+                  style = { color: "#67c23a" };
                   break;
                 default:
                   break;

+ 1 - 1
src/SDrpManagement/commissionDistribution/index.vue

@@ -53,7 +53,7 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'status'">
-          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#3874f6':'#67c23a'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
           <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>

+ 1 - 1
src/SDrpManagement/salerAccount/index.vue

@@ -32,7 +32,7 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'status'">
-          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '0'?'#52c41a':'#333333'}">{{scope.data.column.data[[scope.data.column.columnname]] == '0'?$t('在职'):$t('离职')}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '0'?'#67c23a':'#cccccc'}">{{scope.data.column.data[[scope.data.column.columnname]] == '0'?$t('在职'):$t('离职')}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'balance'">
           <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ 0.00':'--'}}</span>

+ 1 - 1
src/SDrpManagement/salerAccount/modules/detail.vue

@@ -41,7 +41,7 @@
         </div>
       </div>
       <div style="padding:0 16px 0 16px">
-        <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 205px)" :width="true" :custom="true" >
+        <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 205px)" :width="true" :custom="true" fixedName="operation">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'type'">
               {{scope.column.data[[scope.column.columnname]] == '1' ? '收入':'支出'}}

+ 4 - 4
src/SDrpManagement/salerExpenditure/detail/index.vue

@@ -89,10 +89,10 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "新建":
-                style = { color: "#333333" };
+                style = { color: "#3874f6" };
                 break;
               case "审核":
-                style = { color: "#52c41a" };
+                style = { color: "#e6a23c" };
                 break;
               default:
                 break;
@@ -139,10 +139,10 @@ export default {
               let style = {};
               switch (that.mainData.status) {
                 case "新建":
-                  style = { color: "#333333" };
+                  style = { color: "#3874f6" };
                   break;
                 case "审核":
-                  style = { color: "#52c41a" };
+                  style = { color: "#e6a23c" };
                   break;
                 default:
                   break;

+ 1 - 1
src/SDrpManagement/salerExpenditure/index.vue

@@ -43,7 +43,7 @@
             scope.data.column.data.sourcenote !== ''?'系统备注:' + scope.data.column.data.sourcenote : scope.data.column.data.remarks !== ''?'人工备注:' + scope.data.column.data.remarks:'--'}}
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
-          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#3874f6':'#e6a23c'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
           <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>

+ 4 - 4
src/SDrpManagement/salerIncome/detail/index.vue

@@ -93,10 +93,10 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "新建":
-                style = { color: "#333333" };
+                style = { color: "#3874f6" };
                 break;
               case "审核":
-                style = { color: "#52c41a" };
+                style = { color: "#e6a23c" };
                 break;
               default:
                 break;
@@ -143,10 +143,10 @@ export default {
               let style = {};
               switch (that.mainData.status) {
                 case "新建":
-                  style = { color: "#333333" };
+                  style = { color: "#3874f6" };
                   break;
                 case "审核":
-                  style = { color: "#52c41a" };
+                  style = { color: "#e6a23c" };
                   break;
                 default:
                   break;

+ 3 - 3
src/SDrpManagement/salerIncome/index.vue

@@ -25,7 +25,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label  class="search__label">审核时间:</label>
+          <label  class="search__label">{{$t(`审核时间`)}}:</label>
           <el-date-picker
               v-model="selectDate"
               size="small"
@@ -40,7 +40,7 @@
           </el-date-picker>
         </div>
         <div class="mt-10">
-          <label  class="search__label">订单号:</label>
+          <label  class="search__label">{{$t(`订单号`)}}:</label>
           <el-input  style="width:200px;" placeholder="搜索订单号" :suffix-icon="sonum?sonum.length > 0?'':'':'el-icon-search'" v-model="sonum" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
@@ -51,7 +51,7 @@
             scope.data.column.data.sourcenote !== ''?'系统备注:' + scope.data.column.data.sourcenote : scope.data.column.data.remarks !== ''?'人工备注:' + scope.data.column.data.remarks:'--'}}
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
-          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#3874f6':'#e6a23c'}">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
           <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>

+ 2 - 0
src/components/delete_btn/index.vue

@@ -11,6 +11,7 @@
         size="mini"
         v-if="type == 'detail'"
         :disabled="disabled"
+        style="color: #f56c6c"
         >{{ $t("删 除") }}</el-button
       >
       <el-button
@@ -18,6 +19,7 @@
         size="mini"
         type="text"
         :disabled="disabled"
+        style="color: #f56c6c"
         v-else
         >{{ $t("删 除") }}</el-button
       >

+ 1 - 1
src/components/newLayout/index.vue

@@ -122,7 +122,7 @@ export default {
         } else {
           this.marginTrue = false
         }*/
-      }, 200);
+      }, 1000);
     },
     goPassword() {
       this.dialogVisible = false;

+ 2 - 2
src/router/HDrpManagement.js

@@ -788,8 +788,8 @@ const HDrpManagement = [
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/numberManage/index'),
     children: [
       {
-        path: '/numberManag eDetail',
-        name:'collectionRule',
+        path: '/numberManageDetail',
+        name:'numbeManage',
         meta: {
           title: '序列号管理详情',
           ast_nav: true,

+ 5 - 4
src/views/mediaStatistics/modules/salesfunnel.vue

@@ -180,10 +180,11 @@
       <tableTemp :layout="tablecols" :data="projectList" :opwidth="200" :custom="true" :height="tableHieght">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
-            <span style="color:#52c41a" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '已失败'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '已结案'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span style="color:#3874F6" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span style="color:#67C23A" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span style="color:#f56c6c" v-else-if="scope.column.data[[scope.column.columnname]] == '已失败'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span style="color:#cccccc" v-else-if="scope.column.data[[scope.column.columnname]] == '已结案'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span v-else>{{$t(scope.column.data[[scope.column.columnname]])}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'tag_sys'">
             <div v-for="item in scope.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">