Merge branch 'greenUrgent' into testToMerge

src/Form/projectChange/add.vue

@@ -456,15 +456,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? $t(scope.column.data[scope.column.columnname])
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -959,6 +967,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)

src/Form/projectChange/edit.vue

@@ -469,15 +469,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? $t(scope.column.data[scope.column.columnname])
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -958,6 +966,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)

src/HDrpManagement/serveBill/index.vue

@@ -88,10 +88,10 @@ export default {
     },
     dateChange (date) {
       if (date) {
-        this.where.startdate = date[0]
+        this.where.begindate = date[0]
         this.where.enddate = date[1]
       } else {
-        this.where.startdate = ''
+        this.where.begindate = ''
         this.where.enddate = ''
       }
       this.$refs.list.param.content.where = this.where

src/HDrpManagement/serveBillMag/index.vue

@@ -119,10 +119,10 @@ export default {
     },
     dateChange(date) {
       if (date) {
-        this.where.startdate = date[0];
+        this.where.begindate = date[0];
         this.where.enddate = date[1];
       } else {
-        this.where.startdate = "";
+        this.where.begindate = "";
         this.where.enddate = "";
       }
       this.$refs.list.param.content.where = this.where;

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -336,6 +336,8 @@ export default {
             },
             { label: "企业编号", value: this.mainData.agentnum },
             { label: "企业名称", value: this.mainData.enterprise },
+            { label:'客诉大类',  value: this.mainData.class2},
+            { label:'申请原因',  value: this.mainData.reason},
             { label: "服务联系人", value: this.mainData.scenecontact },
             {
               label: "联系人电话",

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -249,13 +249,25 @@
               </el-tag>
             </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
-          <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          <p v-else><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div  class="container normal-panel" style="text-align:right">
@@ -717,6 +729,7 @@ export default {
           this.repeats = res.data
           this.total = res.total
           this.$refs.form.validateField('projectname')
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0){
             this.siteid == 'HY'?this.dialogTableVisible = true:this.dialogTableVisible = true
           }else {

src/components/duplicatesCheck/customerChangeCheck.vue

@@ -58,11 +58,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesCheck/customerCheck.vue

@@ -59,11 +59,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesCheck/projectChangeCheck.vue

@@ -45,12 +45,24 @@
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">
@@ -127,6 +139,7 @@ export default {
           this.list = res.data;
           this.total = res.total;
           this.currentPage = res.pageNumber;
+          this.tool.getCheckFontProject(res.data)
           if (this.siteid == "HY") {
             if (val == "审核") {
               this.dialogTableVisible = true;

src/components/duplicatesCheck/projectCheck.vue

@@ -39,12 +39,24 @@
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">
@@ -119,6 +131,7 @@ export default {
       } else {
         if (res.total > 0) {
           this.list = res.data;
+          this.tool.getCheckFontProject(res.data)
           this.total = res.total;
           this.currentPage = res.pageNumber;
           if (this.siteid == "HY") {

src/components/duplicatesCheck/publicCustomerCheck.vue

@@ -41,7 +41,14 @@
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">

src/components/duplicatesData/duplicatesCustomer.vue

@@ -49,11 +49,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesData/duplicatesProject.vue

@@ -48,15 +48,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -121,6 +129,7 @@ export default {
       const res = await this.$api.requested(this.param);
       this.list = res.data;
       this.total = res.total
+      this.tool.getCheckFontProject(res.data)
       this.currentPage = res.pageNumber
       this.dialogTableVisible = true;
       if (res.data.length !== 0) {

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -14,8 +14,51 @@
           </el-select>
         </div>
       </template>
+      <template slot="content">
+        <div style="clear: both;">
+          <div class="previous-border-class" v-for="item in dataBoxData" :key="item.index">
+            <div class="previous-style-padding">
+              <div class="justify-div-position">
+                <div class="previous-style-circle" :style="{borderColor:item.color}"></div>
+                <div class="previous-style-font1">{{$t(item.title)}}</div>
+                <el-tooltip effect="dark" placement="top-start" style="margin-top: 3px">
+                  <div slot="content" style="white-space: pre">
+                    {{
+                      $t(
+                          item.description
+                      )
+                    }}
+                  </div>
+                  <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
+                  <img
+                      width="14px"
+                      height="14px"
+                      src="../../../assets/icons/prompt_icon.svg"
+                  />
+                </el-tooltip>
+              </div>
+              <div class="previous-style-font2">
+                <div v-if="item.title1">
+                  <span class="font-color-style-gray previous-style-font4 previous-right-5">{{$t(item.title1)}}</span>
+                  <span class="font-color-style-green previous-style-font3 font-class-bold">{{item.value1}}</span>
+                  <span class="font-color-style-green previous-style-font4 font-class-bold">{{$t(item.unit1)}}</span>
+                  <span class="font-color-style-gray previous-style-font4 previous-left-26 previous-right-5">{{$t(item.title2)}}</span>
+                  <span class="font-color-style-green previous-style-font3 font-class-bold">{{item.value2}}</span>
+                  <span class="font-color-style-green previous-style-font4 font-class-bold">{{$t(item.unit2)}}</span>
+                </div>
+                <div v-else>
+                  <span class="font-color-style-green previous-style-font3 font-class-bold">{{item.value}}</span>
+                  <span class="font-color-style-green previous-style-font4 font-class-bold">{{$t(item.unit)}}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
       <template slot="charts">
-        <div ref="chartRef" style="height: 220px;">
+        <div style="clear: both;">
+          <div ref="chartRef" style="height: 220px;">
+          </div>
         </div>
       </template>
     </boxBorder>
@@ -27,6 +70,7 @@ import boxBorder from './boxBorder'
 import {Column} from "@antv/g2plot";
 export default {
   name: "futureTwelveMonths",
+  props:['dataBoxData'],
   components:{
     boxBorder
   },
@@ -63,7 +107,7 @@ export default {
       })
       console.log(this.chartMapData,'chartMapData')
       console.log(this.$refs.selectRef.$el.clientHeight,'高度&&&&&&&高度')
-      this.height = 282
+      this.height = 352
       this.height = this.height + (this.$refs.selectRef.$el.clientHeight -32)
       if (init){
         this.chartMap = new Column(this.$refs.chartRef,{
@@ -137,5 +181,50 @@ export default {
 </script>
 
 <style scoped>
-
+.previous-border-class{
+  width: 28%;
+  height: 68px;
+  float: left;
+  margin-right: 40px;
+}
+.previous-style-padding{
+  padding: 10px 20px;
+}
+.previous-style-circle{
+  width: 5px;
+  height: 5px;
+  background: #FFFFFF;
+  border: 2px solid;
+  line-height: 19px;
+  border-radius: 8px;
+  margin-top: 5px;
+  margin-right: 5px;
+}
+.previous-style-font1{
+  font-family: Microsoft YaHei, Microsoft YaHei;
+  font-weight: 400;
+  font-size: 14px;
+  color: #888888;
+  line-height: 19px;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+  margin-right: 5px;
+}
+.previous-style-font2{
+  margin-top: 5px;
+  margin-left: 15px;
+}
+.previous-style-font3{
+  font-size: 18px;
+}
+.previous-style-font4{
+  font-size: 14px;
+}
+.previous-right-5{
+  margin-right: 5px;
+}
+.previous-left-26{
+  margin-left: 26px;
+}
 </style>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -91,7 +91,7 @@
     <div v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
       <p class="title">{{$t(`项目预计成交分析`)}}</p>
       <previousTwelveMonths :data="previousData"></previousTwelveMonths>
-      <futureTwelveMonths ref="futureTwelveMonthsRef" style="margin-top: 15px" @selectStage="selectStage"></futureTwelveMonths>
+      <futureTwelveMonths ref="futureTwelveMonthsRef" style="margin-top: 15px" @selectStage="selectStage" :dataBoxData="dataBoxData"></futureTwelveMonths>
     </div>
     <div style="margin-top: 40px">
       <p class="title">{{projectTile}}</p>
@@ -263,7 +263,8 @@ export default {
             "isleave":""
           }
         }
-      }
+      },
+      dataBoxData:[]
     }
   },
   methods:{
@@ -921,6 +922,22 @@ export default {
             color:'#E6A23C'
           },
         ]
+        this.dataBoxData = [
+          {
+            title:'预计签约金额合计',
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data.sumsignamount_due,10000),2),
+            unit:'万元',
+            description:'合计未来12个月的项目预计签约金额',
+            color: '#3874F6'
+          },
+          {
+            title:'预计成交金额合计',
+            value:this.tool.formatAmount(this.tool.unitConversion(res.data.sumdealamount_due,10000),2),
+            unit:'万元',
+            description:'合计未来12个月的项目预计成交金额',
+            color: '#E6A23C'
+          },
+        ]
         this.futreData = res.data.array
         this.$refs.futureTwelveMonthsRef.chartData(init,this.futreData)
       }