Merge branch 'blueBranch' into allTestUrgent

# Conflicts:
#	src/HDrpManagement/serveBillMag/index.vue

src/HDrpManagement/serveBill/modules/detail.vue

@@ -219,23 +219,7 @@ 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;
-            }
+            let style = that.tool.getStatusColor(that.mainData.servicetype)
             return style
           }
         },
@@ -296,25 +280,11 @@ export default {
             { label: "关联订单", value: this.mainData.sonum },
             { 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;
-                }
+                let style = that.tool.getStatusColor(that.mainData.servicetype)
                 return style
-              }},
+
+              }
+            },
             { label: "现场联系人", value: this.mainData.scenecontact },
             { label: "身份备注", value: this.mainData.scenecontactrole },
             {

src/HDrpManagement/serveBillMag/index.vue

@@ -79,6 +79,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="tool.getStatusColor(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]]
@@ -123,15 +128,6 @@ 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>

src/HDrpManagement/serveBillMag/modules/detail.vue

@@ -119,7 +119,6 @@ export default {
           style:function () {
             let style = that.tool.getStatusColor(that.mainData.status)
             return style
-
           }
         },
         {label:'企业编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
@@ -129,25 +128,10 @@ export default {
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
         {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;
-            }
+            let style = that.tool.getStatusColor(that.mainData.servicetype)
             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 : ''},
@@ -172,33 +156,18 @@ export default {
               style:function () {
                 let style = that.tool.getStatusColor(that.mainData.status)
                 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,
               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;
-                }
+                let style = that.tool.getStatusColor(that.mainData.servicetype)
                 return style
-              }},
+              }
+            },
             {label:'现场联系人',value:this.mainData.scenecontact},
             {label:'身份备注',value:this.mainData.scenecontactrole},
             {label:'现场联系人手机号',value:this.mainData.scenecontactphonenumber},

src/SManagement/submitedit_one/components/list.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="list" v-if="list.length != 0">
-    <div class="list-item"  :class="item.ishistory == 0?'list-shadow-y':'list-shadow-g'" @click="itemClick(item.sat_submiteditmodelid,item.ishistory)" v-for="(item,index) in list" :style="{borderColor:item.ishistory == 0?'#e6a23c':'#999999'}"
+    <div class="list-item"  :class="item.ishistory == 0?'list-shadow-y':'list-shadow-g'" @click="itemClick(item.sat_submiteditmodelid,item.ishistory)" v-for="(item,index) in list" :style="{borderColor:item.ishistory == 0?'#67C23A':'#999999'}"
       :key="index">
       <div style="display: flex;justify-content: space-between">
-        <div class="headerState" :style="{backgroundColor:item.ishistory == 0?'#e6a23c':'#999999'}">
+        <div class="headerState" :style="{backgroundColor:item.ishistory == 0?'#67C23A':'#999999'}">
           {{item.ishistory == 0 ? $t('进行中') : $t('已结束')}}
         </div>
-        <div class="tag-style-border" >
-          <div :class="item.isRead == 0?'no-read':'read'">{{item.isRead == 0 ? $t('未读') : $t('已读')}}</div>
+        <div style="margin-top: 3px">
+          <div class="tag-style-border" :class="item.isRead == 0?'no-read':'read'">{{item.isRead == 0 ? $t('未读') : $t('已读')}}</div>
         </div>
       </div>
       <div class="title-font-b title-show-style">
@@ -112,7 +112,7 @@ export default {
   box-shadow: 1px 6px 6px 1px rgba(153,153,153, 0.35);
 }
 .list-shadow-y:hover{
-  box-shadow: 1px 6px 6px 1px rgba(230,162,60, 0.35);
+  box-shadow: 1px 6px 6px 1px rgba(103,194,58, 0.35);
 }
 .list .list-item .headerState {
   width: 50px;
@@ -125,13 +125,14 @@ export default {
   font-size: 10px;
 }
 .tag-style-border{
-  width: 46px;
-  height: 24px;
+  width: 30px;
+  height: 18px;
   border-radius: 4px 4px 4px 4px;
   font-size: 10px;
   font-weight: normal;
   text-align: center;
-  line-height: 24px;
+  line-height: 18px;
+  vertical-align: middle;
 }
 .read {
   color: #67c23a;