Merge branch 'redUrgent' into mergeBranch

src/HDrpManagement/contactProfile/modules/detail.vue

@@ -123,7 +123,7 @@
                 value:$refs.customerRef && $refs.customerRef.list[0] && $refs.customerRef.list[0].tradingqty,
                 value3: $refs.customerRef && $refs.customerRef.list[0] && $refs.customerRef.list[0].tradingamount,
                 value4:$refs.customerRef && $refs.customerRef.list[0] && $refs.customerRef.list[0].tradingcjl,
-                value2descript:'成交率',
+                value2descript:'成交率',descript:'关联客户的成交率=有成交的关联客户数÷关联的客户总数x100%',
                 bg:'#E8F7EC',color:'#78B32B'},
               ]"
             >
@@ -194,7 +194,7 @@
                 value:$refs.projectRef && $refs.projectRef.list[0] && $refs.projectRef.list[0].tradingqty,
                 value3: $refs.projectRef && $refs.projectRef.list[0] && $refs.projectRef.list[0].tradingamount,
                 value4:$refs.projectRef && $refs.projectRef.list[0] && $refs.projectRef.list[0].tradingcjl,
-                value2descript:'成交率',
+                value2descript:'成交率',descript:'关联项目的成交率=有成交的关联项目数÷关联的项目总数x100%',
                 bg:'#E8F7EC',color:'#78B32B'},
               ]"
             >

src/HDrpManagement/contactProfile/modules/myNewCrad.vue

@@ -12,17 +12,17 @@
             }}</p>
           <div style="position: relative;">
             <span v-if="item.value2descript"
-                  style="position:absolute;top:-20px;right:0px;font-size:14px;white-space:nowrap;">{{
+                  style="position:absolute;top:-20px;right:25px;font-size:14px;white-space:nowrap;">{{
                 item.value2descript
               }}</span>
-            <p :style="[{'font-size':'16px'},{'color':+item.value2 > 0 ? '#000000' : item.color}]">{{ item.value4 }}</p>
+            <p :style="[{'font-size':'16px'},{'color':+item.value2 > 0 ? '#000000' : item.color},{'marginRight':'25px'}]">{{ item.value4 }}</p>
           </div>
         </div>
         <slot v-if="item.custom" :data="item" :name="item.custom"></slot>
       </div>
-      <el-tooltip :content="item.descript" effect="dark" placement="top">
+      <el-tooltip :content="item.descript" effect="dark" placement="top" >
         <i v-if="item.descript" class="el-icon-warning-outline"
-           style="cursor: pointer;position:absolute;right:10px;top:10px"></i>
+           style="cursor: pointer;position:absolute;right:10px;top:14px"></i>
       </el-tooltip>
     </div>
 

src/HManagement/addressList/addressBook/index.vue

@@ -60,8 +60,15 @@
         </div>
       </template>
       <template #tableLeft style="padding: 0">
-        <div style="margin: 0;padding: 0;min-width: 320px;max-width: 320px;">
-          <myGroup ref="groupRef" @clickGroup="clickGroup" @groupList="groupList" :typeTab="tabName" @delGroup="onReset"></myGroup>
+        <div :style="[{'margin': '0'},{'padding': '0'},{'minWidth': isShow?'320px':'45px'},{'maxWidth':isShow?'320px':'45px'}]">
+          <div style="padding: 0 10px 0 10px">
+            <div style="float: right;">
+              <el-button v-if="isShow" type="text" icon="el-icon-s-unfold"  @click="onCollapse" size="medium" ></el-button>
+              <el-button v-if="!isShow"  type="text" icon="el-icon-s-fold"  @click="onCollapse" size="medium" ></el-button>
+            </div>
+          </div>
+          <myGroup v-if="isShow" ref="groupRef" @clickGroup="clickGroup" @groupList="groupList" :typeTab="tabName" @delGroup="onReset">
+          </myGroup>
         </div>
       </template>
       <template v-slot:tbList="scope">
@@ -82,6 +89,9 @@
         <div v-else-if="scope.data.column.columnname === 'islinkproject'">
           <div>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]] === 0?'否':'是':'否'}}</div>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'orderamount'">
+          <div>{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</div>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
@@ -173,7 +183,8 @@ export default {
         }
       },
       groupname:'',
-      contactstype:''
+      contactstype:'',
+      isShow:true
     }
   },
   methods:{
@@ -285,6 +296,9 @@ export default {
     onDelSuccess(){
       console.log('抽屉关闭')
       /*this.onReset()*/
+    },
+    onCollapse(){
+      this.isShow = this.isShow?false:true
     }
   },
   mounted() {
@@ -295,5 +309,14 @@ export default {
 </script>
 
 <style scoped>
+/deep/ .el-button--medium {
+  padding:0;
+  font-size: 24px;
+  /* border-radius: 4px; */
+}
+/deep/ .normal-panel[data-v-6c61de12] {
+  width: 250px;
+   border-right: 0px solid #f1f2f3;
+}
 
 </style>