代码上传

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -1,6 +1,6 @@
 <template>
   <div >
-    <el-button  @click="submit" size="mini" slot="reference" type="primary" v-if="data.status=='新建' && tool.checkAuth($route.name,'submit') && !disabled && data.status">提 交</el-button>
+    <el-button  @click="submit" size="mini" slot="reference" type="primary" :disabled="data.status == '已过期'" v-if="data.status=='新建' && tool.checkAuth($route.name,'submit') && !disabled && data.status">提 交</el-button>
     <el-button @click="submit" size="mini" slot="reference" type="primary" v-if="data.status=='已提交' && tool.checkAuth($route.name,'check') && data.status">审 核</el-button>
   </div>
 </template>

src/HDrpManagement/contractManage/index.vue

@@ -68,6 +68,7 @@
             <el-option label="审核" value="审核" ></el-option>
             <el-option label="已提交" value="已提交" ></el-option>
             <el-option label="已终止" value="已终止" ></el-option>
+            <el-option label="已过期" value="已过期" ></el-option>
           </el-select>
         </div>
         <div class="mt-10">

src/HDrpManagement/contractManage/modules/detail.vue

@@ -351,6 +351,9 @@ export default {
                 case '审核':
                   style = {color:'#333333'}
                   break;
+              case '已过期':
+                style = {color:'#999999'}
+                break;
                 default:
                   break;
               }
@@ -426,6 +429,9 @@ export default {
                 case '审核':
                   style = {color:'#333333'}
                   break;
+                case '已过期':
+                  style = {color:'#999999'}
+                  break;
                 default:
                   break;
               }
@@ -507,6 +513,9 @@ export default {
                 case '审核':
                   style = {color:'#333333'}
                   break;
+                case '已过期':
+                  style = {color:'#999999'}
+                  break;
                 default:
                   break;
               }
@@ -596,6 +605,9 @@ export default {
                 case '审核':
                   style = {color:'#333333'}
                   break;
+              case '已过期':
+                style = {color:'#999999'}
+                break;
                 default:
                   break;
               }
@@ -676,6 +688,9 @@ export default {
                 case '审核':
                   style = {color:'#333333'}
                   break;
+                case '已过期':
+                  style = {color:'#999999'}
+                  break;
                 default:
                   break;
               }
@@ -801,6 +816,9 @@ export default {
                         case '审核':
                           style = {color:'#333333'}
                           break;
+                        case '已过期':
+                          style = {color:'#999999'}
+                          break;
                         default:
                           break;
                       }
@@ -908,6 +926,9 @@ export default {
                         case '审核':
                           style = {color:'#333333'}
                           break;
+                        case '已过期':
+                          style = {color:'#999999'}
+                          break;
                         default:
                           break;
                       }
@@ -1010,6 +1031,9 @@ export default {
                         case '审核':
                           style = {color:'#333333'}
                           break;
+                        case '已过期':
+                          style = {color:'#999999'}
+                          break;
                         default:
                           break;
                       }
@@ -1092,6 +1116,9 @@ export default {
                             case '审核':
                               style = {color:'#333333'}
                               break;
+                            case '已过期':
+                              style = {color:'#999999'}
+                              break;
                             default:
                               break;
                           }
@@ -1192,6 +1219,9 @@ export default {
                             case '审核':
                               style = {color:'#333333'}
                               break;
+                            case '已过期':
+                              style = {color:'#999999'}
+                              break;
                             default:
                               break;
                           }

src/HDrpManagement/customerPortrait/index.vue

@@ -14,7 +14,7 @@
           </el-select>
         </div>
       </div>
-      <el-scrollbar >
+      <el-scrollbar>
       <div style="min-width: 1500px;padding: 10px 20px 5px 20px;height:calc(100vh - 300px)">
         <div style="width: 20%;float: left" >
           <el-table border :data="list" ref="table" highlight-current-row  @row-click="rowClick">
@@ -49,8 +49,8 @@
           </div>
 
         </div>
-        <div style="width: 79%;float: right;">
-          <mindmap v-if="flag" ref="custom" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="sa_customersid" name="custom"></mindmap>
+        <div style="width: 79.5%;height:100%;float: right;overflow: hidden" v-if="flag">
+          <mindmap :contentStyle="{height:'75vh',width:'66vw'}" :divStyle="{height:'76.5vh',width:'100%'}" ref="custom" class="inline-16" :id="sa_customersid" :show="show" :isList="1"></mindmap>
         </div>
       </div>
       </el-scrollbar>
@@ -70,6 +70,7 @@ export default {
       total:0,
       flag:false,
       sa_customersid:'',
+      show:'1',
       editableTabs:[
         {
           templetname:'我负责的',
@@ -111,28 +112,29 @@ export default {
       this.listData()
     },
     async listData(){
+      this.$store.dispatch('changeDetailDrawer',false)
       this.param.content.type = this.value
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
-      console.log(res.data,'客户')
+
       this.sa_customersid = res.data[0].sa_customersid
       this.flag = true
-      this.$nextTick(()=>{
+      this.$refs.table.setCurrentRow(this.list[0])
+    /*  this.$nextTick(()=>{
         this.$refs.custom.getData()
-        this.$refs.table.setCurrentRow(this.list[0])
-      })
+
+      })*/
 
     },
     rowClick(val){
-      console.log(val)
+      this.flag = false
       this.sa_customersid = val.sa_customersid
-
       this.$nextTick(()=>{
-        this.$refs.custom.getData()
         this.flag = true
-      })
 
+      })
+     /* this.queryData()*/
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -28,10 +28,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.unamount < 0" style="color: #E13333">
-                            ¥{{listby.unamount<-10000 ?tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount<-100000000?tool.formatAmount(listby.unamount/100000000,2)+'亿':tool.formatAmount(listby.unamount,2)}}
+                            ¥{{listby.unamount<-100000000 ?tool.formatAmount(listby.unamount/100000000,2)+'亿':listby.unamount<-10000?tool.formatAmount(listby.unamount/10000,2)+'万':tool.formatAmount(listby.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-                            ¥{{listby.unamount >10000 ? tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2)+'亿':tool.formatAmount(listby.unamount,2)}}
+                            ¥{{listby.unamount >100000000 ? tool.formatAmount(listby.unamount/100000000,2)+'亿':listby.unamount>10000?tool.formatAmount(listby.unamount/10000,2)+'万':tool.formatAmount(listby.unamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -44,10 +44,10 @@
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       <span>
-                       ¥ {{listby.amount>10000 ?tool.formatAmount(listby.amount/10000,2) + '万':listby.amount>100000000?tool.formatAmount(listby.amount/100000000,2)+ '亿':tool.formatAmount(listby.amount,2)}}
+                       ¥ {{listby.amount>100000000 ?tool.formatAmount(listby.amount/100000000,2) + '亿':listby.amount>10000?tool.formatAmount(listby.amount/10000,2)+ '万':tool.formatAmount(listby.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>100000000 ?tool.formatAmount(listby.target_l/100000000,2) + '亿':listby.target_l>10000?tool.formatAmount(listby.target_l/10000,2)+ '万':tool.formatAmount(listby.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -73,12 +73,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.unoutamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listby.unoutamount,2)}}-->
-                             ¥{{listby.unamount<-10000 ?tool.formatAmount(listby.unoutamount/10000,2)+'万':listby.unoutamount<-100000000?tool.formatAmount(listby.unoutamount/100000000,2)+'亿':tool.formatAmount(listby.unoutamount,2)}}
+                             ¥{{listby.unamount<-100000000 ?tool.formatAmount(listby.unoutamount/100000000,2)+'亿':listby.unoutamount<-10000?tool.formatAmount(listby.unoutamount/10000,2)+'万':tool.formatAmount(listby.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listby.unoutamount,2)}}-->
-                             ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unoutamount/10000,2)+'万':listby.unoutamount>100000000?tool.formatAmount(listby.unoutamount/100000000,2) +'亿':tool.formatAmount(listby.unoutamount,2)}}
+                             ¥{{listby.unamount>100000000 ?tool.formatAmount(listby.unoutamount/100000000,2)+'亿':listby.unoutamount>10000?tool.formatAmount(listby.unoutamount/10000,2) +'万':tool.formatAmount(listby.unoutamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -91,10 +89,10 @@
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
                       <span>
-                       ¥ {{listby.outamount>10000 ?tool.formatAmount(listby.outamount/10000,2) + '万':listby.outamount>100000000?tool.formatAmount(listby.outamount/100000000,2)+ '亿':tool.formatAmount(listby.outamount,2)}}
+                       ¥ {{listby.outamount>100000000 ?tool.formatAmount(listby.outamount/100000000,2) + '亿':listby.outamount>10000?tool.formatAmount(listby.outamount/10000,2)+ '万':tool.formatAmount(listby.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>100000000 ?tool.formatAmount(listby.target_l/100000000,2) + '亿':listby.target_l>10000?tool.formatAmount(listby.target_l/10000,2)+ '万':tool.formatAmount(listby.target_l,2)}}
                       </span>
 <!--                      {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}-->
                     </span>
@@ -122,12 +120,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}-->
-                             ¥{{listby.uninvoiceamount<-10000 ?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':listby.uninvoiceamount<-100000000?tool.formatAmount(listby.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listby.uninvoiceamount,2)}}
+                             ¥{{listby.uninvoiceamount<-100000000 ?tool.formatAmount(listby.uninvoiceamount/100000000,2)+'亿':listby.uninvoiceamount<-10000?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':tool.formatAmount(listby.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}-->
-                             ¥{{listby.uninvoiceamount>10000 ?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':listby.uninvoiceamount>100000000?tool.formatAmount(listby.uninvoiceamount/100000000,2) +'亿':tool.formatAmount(listby.uninvoiceamount,2)}}
+                             ¥{{listby.uninvoiceamount>100000000 ?tool.formatAmount(listby.uninvoiceamount/100000000,2)+'亿':listby.uninvoiceamount>10000?tool.formatAmount(listby.uninvoiceamount/10000,2) +'万':tool.formatAmount(listby.uninvoiceamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -139,14 +135,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}-->
-<!--                       {{'¥'+listby.amount>10000 ?tool.formatAmount(listby.amount/10000,2) + '万':listby.amount>100000000?tool.formatAmount(listby.amount/100000000,2)+ '亿':tool.formatAmount(listby.amount,2)
-                    +'/'+ '¥'+listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}-->
                       <span>
-                       ¥ {{listby.invoiceamount>10000 ?tool.formatAmount(listby.invoiceamount/10000,2) + '万':listby.invoiceamount>100000000?tool.formatAmount(listby.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listby.invoiceamount,2)}}
+                       ¥ {{listby.invoiceamount>100000000 ?tool.formatAmount(listby.invoiceamount/100000000,2) + '亿':listby.invoiceamount>10000?tool.formatAmount(listby.invoiceamount/10000,2)+ '万':tool.formatAmount(listby.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>100000000 ?tool.formatAmount(listby.target_l/100000000,2) + '亿':listby.target_l>10000?tool.formatAmount(listby.target_l/10000,2)+ '万':tool.formatAmount(listby.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -184,12 +177,10 @@
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbj.unamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbj.unamount,2)}}-->
-                              ¥{{listbj.unamount<-10000 ?tool.formatAmount(listbj.unamount/10000,2)+'万':listbj.unamount<-100000000?tool.formatAmount(listbj.unamount/100000000,2)+'亿':tool.formatAmount(listbj.unamount,2)}}
+                              ¥{{listbj.unamount<-100000000 ?tool.formatAmount(listbj.unamount/100000000,2)+'亿':listbj.unamount<-10000?tool.formatAmount(listbj.unamount/10000,2)+'万':tool.formatAmount(listbj.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbj.unamount,2)}}-->
-                             ¥{{listbj.unamount>10000 ?tool.formatAmount(listbj.unamount/10000,2)+'万':listbj.unamount>100000000?tool.formatAmount(listbj.unamount/100000000,2) +'亿':tool.formatAmount(listbj.unamount,2)}}
+                             ¥{{listbj.unamount>100000000 ?tool.formatAmount(listbj.unamount/100000000,2)+'亿':listbj.unamount>10000?tool.formatAmount(listbj.unamount/10000,2) +'万':tool.formatAmount(listbj.unamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -202,14 +193,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}-->
-<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
-                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
                        <span>
-                       ¥ {{listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)}}
+                       ¥ {{listbj.amount>100000000 ?tool.formatAmount(listbj.amount/100000000,2) + '亿':listbj.amount>10000?tool.formatAmount(listbj.amount/10000,2)+ '万':tool.formatAmount(listbj.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                         /¥ {{listbj.target_l>100000000 ?tool.formatAmount(listbj.target_l/100000000,2) + '亿':listbj.target_l>10000?tool.formatAmount(listbj.target_l/10000,2)+ '万':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -237,11 +225,11 @@
                          <span style="font-size: 12px;padding: 0 0 0 5px">
                            <span v-if="listbj.unoutamount < 0" style="color: #E13333">
 <!--                            ¥{{tool.formatAmount(listbj.unoutamount,2)}}-->
-                              ¥{{listbj.unamount<-10000 ?tool.formatAmount(listbj.unoutamount/10000,2)+'万':listbj.unoutamount<-100000000?tool.formatAmount(listbj.unoutamount/100000000,2)+'亿':tool.formatAmount(listbj.unoutamount,2)}}
+                              ¥{{listbj.unamount<-100000000 ?tool.formatAmount(listbj.unoutamount/100000000,2)+'亿':listbj.unoutamount<-10000?tool.formatAmount(listbj.unoutamount/10000,2)+'万':tool.formatAmount(listbj.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbj.unoutamount,2)}}-->
-                              ¥{{listbj.unamount>10000 ?tool.formatAmount(listbj.unoutamount/10000,2)+'万':listbj.unoutamount>100000000?tool.formatAmount(listbj.unoutamount/100000000,2) +'亿':tool.formatAmount(listbj.unoutamount,2)}}
+                              ¥{{listbj.unamount>100000000 ?tool.formatAmount(listbj.unoutamount/100000000,2)+'亿':listbj.unoutamount>10000?tool.formatAmount(listbj.unoutamount/10000,2) +'万':tool.formatAmount(listbj.unoutamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -257,10 +245,10 @@
 <!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
                     +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
                        <span>
-                       ¥ {{listbj.outamount>10000 ?tool.formatAmount(listbj.outamount/10000,2) + '万':listbj.outamount>100000000?tool.formatAmount(listbj.outamount/100000000,2)+ '亿':tool.formatAmount(listbj.outamount,2)}}
+                       ¥ {{listbj.outamount>100000000 ?tool.formatAmount(listbj.outamount/100000000,2) + '亿':listbj.outamount>10000?tool.formatAmount(listbj.outamount/10000,2)+ '万':tool.formatAmount(listbj.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                       /¥ {{listbj.target_l>100000000 ?tool.formatAmount(listbj.target_l/100000000,2) + '亿':listbj.target_l>10000?tool.formatAmount(listbj.target_l/10000,2)+ '万':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -288,11 +276,11 @@
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                            <span v-if="listbj.uninvoiceamount < 0" style="color: #E13333">
 <!--                            ¥{{tool.formatAmount(listbj.uninvoiceamount,2)}}-->
-                              ¥{{listbj.uninvoiceamount<-10000 ?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':listbj.uninvoiceamount<-100000000?tool.formatAmount(listbj.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbj.uninvoiceamount,2)}}
+                              ¥{{listbj.uninvoiceamount<-100000000 ?tool.formatAmount(listbj.uninvoiceamount/100000000,2)+'亿':listbj.uninvoiceamount<-10000?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':tool.formatAmount(listbj.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbj.uninvoiceamount,2)}}-->
-                              ¥{{listbj.uninvoiceamount>10000 ?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':listbj.uninvoiceamount>100000000?tool.formatAmount(listbj.uninvoiceamount/100000000,2) +'亿':tool.formatAmount(listbj.uninvoiceamount,2)}}
+                              ¥{{listbj.uninvoiceamount>100000000 ?tool.formatAmount(listbj.uninvoiceamount/100000000,2)+'亿':listbj.uninvoiceamount>10000?tool.formatAmount(listbj.uninvoiceamount/10000,2) +'万':tool.formatAmount(listbj.uninvoiceamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -308,10 +296,10 @@
 <!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
                     +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
                       <span>
-                       ¥ {{listbj.invoiceamount>10000 ?tool.formatAmount(listbj.invoiceamount/10000,2) + '万':listbj.invoiceamount>100000000?tool.formatAmount(listbj.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listbj.invoiceamount,2)}}
+                       ¥ {{listbj.invoiceamount>100000000 ?tool.formatAmount(listbj.invoiceamount/100000000,2) + '亿':listbj.invoiceamount>10000?tool.formatAmount(listbj.invoiceamount/10000,2)+ '万':tool.formatAmount(listbj.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                       /¥ {{listbj.target_l>100000000 ?tool.formatAmount(listbj.target_l/100000000,2) + '亿':listbj.target_l>10000?tool.formatAmount(listbj.target_l/10000,2)+ '万':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -350,12 +338,10 @@
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbn.unamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbn.unamount,2)}}-->
-                             ¥{{listbn.unamount<-10000 ?tool.formatAmount(listbn.unamount/10000,2)+'万':listbn.unamount<-100000000?tool.formatAmount(listbn.unamount/100000000,2)+'亿':tool.formatAmount(listbn.unamount,2)}}
+                             ¥{{listbn.unamount<-100000000 ?tool.formatAmount(listbn.unamount/100000000,2)+'亿':listbn.unamount<-10000?tool.formatAmount(listbn.unamount/10000,2)+'万':tool.formatAmount(listbn.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.unamount,2)}}-->
-                             ¥{{listbn.unamount>10000 ?tool.formatAmount(listbn.unamount/10000,2)+'万':listbn.unamount>100000000?tool.formatAmount(listbn.unamount/100000000,2) +'亿':tool.formatAmount(listbn.unamount,2)}}
+                             ¥{{listbn.unamount>100000000 ?tool.formatAmount(listbn.unamount/100000000,2)+'亿':listbn.unamount>10000?tool.formatAmount(listbn.unamount/10000,2) +'万':tool.formatAmount(listbn.unamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -367,14 +353,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                       {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
-                       ¥ {{listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)}}
+                       ¥ {{listbn.amount>100000000 ?tool.formatAmount(listbn.amount/100000000,2) + '亿':listbn.amount>10000?tool.formatAmount(listbn.amount/10000,2)+ '万':tool.formatAmount(listbn.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                      /¥ {{listbn.target_l>100000000 ?tool.formatAmount(listbn.target_l/100000000,2) + '亿':listbn.target_l>10000?tool.formatAmount(listbn.target_l/10000,2)+ '万':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -400,12 +383,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbn.unoutamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbn.unoutamount,2)}}-->
-                            ¥{{listbn.unamount<-10000 ?tool.formatAmount(listbn.unoutamount/10000,2)+'万':listbn.unoutamount<-100000000?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':tool.formatAmount(listbn.unoutamount,2)}}
+                            ¥{{listbn.unamount<-100000000 ?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':listbn.unoutamount<-10000?tool.formatAmount(listbn.unoutamount/10000,2)+'万':tool.formatAmount(listbn.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.unoutamount,2)}}-->
-                            ¥{{listbn.unamount>10000 ?tool.formatAmount(listbn.unoutamount/10000,2)+'万':listbn.unoutamount>100000000?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':tool.formatAmount(listbn.unoutamount,2)}}
+                            ¥{{listbn.unamount>100000000 ?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':listbn.unoutamount>10000?tool.formatAmount(listbn.unoutamount/10000,2)+'万':tool.formatAmount(listbn.unoutamount,2)}}
                           </span>
                        </span>
                       </div>
@@ -418,14 +399,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                        {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
-                       ¥ {{listbn.outamount>10000 ?tool.formatAmount(listbn.outamount/10000,2) + '万':listbn.outamount>100000000?tool.formatAmount(listbn.outamount/100000000,2)+ '亿':tool.formatAmount(listbn.outamount,2)}}
+                       ¥ {{listbn.outamount>100000000 ?tool.formatAmount(listbn.outamount/100000000,2) + '亿':listbn.outamount>10000?tool.formatAmount(listbn.outamount/10000,2)+ '万':tool.formatAmount(listbn.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                        /¥ {{listbn.target_l>100000000 ?tool.formatAmount(listbn.target_l/100000000,2) + '亿':listbn.target_l>10000?tool.formatAmount(listbn.target_l/10000,2)+ '万':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -452,12 +430,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                          <span v-if="listbn.uninvoiceamount < 0" style="color: #E13333">
-<!--                          ¥{{tool.formatAmount(listbn.uninvoiceamount,2)}}-->
-                           ¥{{listbn.uninvoiceamount<-10000 ?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':listbn.uninvoiceamount<-100000000?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbn.uninvoiceamount,2)}}
+                           ¥{{listbn.uninvoiceamount<-100000000 ?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':listbn.uninvoiceamount<-10000?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':tool.formatAmount(listbn.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.uninvoiceamount,2)}}-->
-                              ¥{{listbn.uninvoiceamount>10000 ?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':listbn.uninvoiceamount>100000000?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbn.uninvoiceamount,2)}}
+                              ¥{{listbn.uninvoiceamount>100000000 ?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':listbn.uninvoiceamount>10000?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':tool.formatAmount(listbn.uninvoiceamount,2)}}
                           </span>
                          </span>
                       </div>
@@ -470,14 +446,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                         {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
-                       ¥ {{listbn.invoiceamount>10000 ?tool.formatAmount(listbn.invoiceamount/10000,2) + '万':listbn.invoiceamount>100000000?tool.formatAmount(listbn.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listbn.invoiceamount,2)}}
+                       ¥ {{listbn.invoiceamount>100000000 ?tool.formatAmount(listbn.invoiceamount/100000000,2) + '亿':listbn.invoiceamount>10000?tool.formatAmount(listbn.invoiceamount/10000,2)+ '万':tool.formatAmount(listbn.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                         /¥ {{listbn.target_l>100000000 ?tool.formatAmount(listbn.target_l/100000000,2) + '亿':listbn.target_l>10000?tool.formatAmount(listbn.target_l/10000,2)+ '万':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -244,7 +244,7 @@ export default {
       this.getProjectAddres()
       this.projectStage()
       this.tagData()
-      if (this.$route.query.portrait !== ''){
+      if (this.$route.query.portrait != ''){
         this.$refs.mindmap.onShow()
       }
     },
@@ -414,7 +414,7 @@ export default {
           {label:'最近编辑人',value:this.mainData.changeby ? this.mainData.changeby : '--'},
           {label:'最近编辑时间',value:this.mainData.changedate ? this.mainData.changedate : '--'},
           {label:'提交报备人',value:this.mainData.reportby?this.mainData.reportby:'--'},
-          {label:'提报报备时间',value:this.mainData.reportdate?this.mainData.reportdate:'--'},
+          {label:'提交报备时间',value:this.mainData.reportdate?this.mainData.reportdate:'--'},
           {label:'报备审核人',value:this.mainData.reportcheckby?this.mainData.reportcheckby:'--'},
           {label:'报备审核时间',value:this.mainData.reportcheckdate?this.mainData.reportcheckdate:'--'},
           /*{label:'锁定状态',value:this.mainData.locked == '0' ? '锁定' : '解锁'},*/

src/HDrpManagement/projectPortrait/index.vue

@@ -54,8 +54,8 @@
           </div>
 
         </div>
-        <div style="width: 79%;float: right;">
-          <mindmap v-if="flag" ref="project" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="sa_projectid" ></mindmap>
+        <div style="width: 79%;height:100%;float: right;" v-if="flag">
+          <mindmap :contentStyle="{height:'75vh',width:'66vw'}" :divStyle="{height:'76.5vh',width:'70.5vw'}" ref="project" class="inline-16" :id="sa_projectid" :show="show"></mindmap>
         </div>
       </div>
       </el-scrollbar>
@@ -74,6 +74,7 @@ export default {
       list:[],
       total:0,
       flag:false,
+      show:'1',
       sa_projectid:'',
       editableTabs:[
         {
@@ -115,23 +116,25 @@ export default {
       this.listData()
     },
     async listData(){
+      this.$store.dispatch('changeDetailDrawer',false)
       this.param.content.type = this.value
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.sa_projectid = res.data[0].sa_projectid
       this.flag = true
-      this.$nextTick(()=>{
+      this.$refs.table.setCurrentRow(this.list[0])
+      /*this.$nextTick(()=>{
         this.$refs.project.getData()
         this.$refs.table.setCurrentRow(this.list[0])
-      })
+      })*/
     },
     rowClick(val){
-      console.log(val)
+      this.flag = false
       this.sa_projectid = val.sa_projectid
       this.$nextTick(()=>{
-        this.$refs.project.getData()
         this.flag = true
+
       })
 
     },

src/HDrpManagement/salerPortrait/index.vue

@@ -4,7 +4,7 @@
       <div style="padding: 20px 20px 5px 20px;">
         <div class="mt-10">
           <label  class="search__label" >范围:</label>
-            <el-cascader  size="small" ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
+            <el-cascader v-model="cvalue"  size="small" ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
         </div>
       </div>
       <el-scrollbar >
@@ -22,7 +22,7 @@
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="tradefield"
+                prop="area"
                 label="区域"
                 width="180">
             </el-table-column>
@@ -41,8 +41,8 @@
           </div>
 
         </div>
-        <div style="width: 79%;float: right;">
-          <mindmap v-if="flag" ref="saler" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="hrid" ></mindmap>
+        <div style="width: 79%;height:100%;float: right;" v-if="flag">
+          <mindmap :contentStyle="{height:'75vh',width:'66vw'}" :divStyle="{height:'76.5vh',width:'70.5vw'}" ref="saler" class="inline-16" :id="hrid" :show="show"></mindmap>
         </div>
       </div>
       </el-scrollbar>
@@ -57,11 +57,12 @@ export default {
   components:{mindmap},
   data() {
     return {
-      value:[],
+      cvalue:[],
       list:[],
       total:0,
       flag:false,
       hrid:'',
+      show:'1',
       depmentParam:{
         "id": 20230620102004,
         "content": {
@@ -89,7 +90,7 @@ export default {
       this.deplist = this.createMenu(res.data.dep)
       console.log(this.deplist,'部门列表')
       this.personParam.content.departmentids = [this.deplist[0].departmentid]
-      this.value = this.deplist[0].label
+      this.cvalue = this.deplist[0].departmentid
       console.log(this.value,'项目选择')
       this.listData()
       /*this.range = JSON.parse(window.sessionStorage.getItem('active_account')).name*/
@@ -148,27 +149,26 @@ export default {
       return arr
     },
     selectDep(val) {
+      console.log(val)
       let dataDep = this.$refs.selectdep.getCheckedNodes(true)[0].data
       this.value = dataDep.label
       this.personParam.content.departmentids = [val[val.length-1]]
       this.listData()
     },
     async listData(){
+      this.$store.dispatch('changeDetailDrawer',false)
       const res = await this.$api.requested(this.personParam)
       this.list = res.data
       this.total = res.total
       this.hrid = res.data[0].hrid
       this.flag = true
-      this.$nextTick(()=>{
-        this.$refs.saler.getData()
-        this.$refs.table.setCurrentRow(this.list[0])
-      })
+      this.$refs.table.setCurrentRow(this.list[0])
     },
     rowClick(val){
       console.log(val)
+      this.flag = false
       this.hrid = val.hrid
       this.$nextTick(()=>{
-        this.$refs.saler.getData()
         this.flag = true
       })
 

src/HManagement/siteManage/securityConfig/index.vue

@@ -7,9 +7,9 @@
     <basicInfo @onSuccess="infoData"></basicInfo>
     <!--消息提示设置-->
     <messageTips/>
-    
+
     <div class="container normal-panel" style="display:flex;justify-content:space-around;border-bottom:none">
-      <el-descriptions title="安全配置"></el-descriptions>
+      <el-descriptions title="规则设置"></el-descriptions>
     </div>
     <div class="panel">
       <div class="flex-align-center flex-between">
@@ -200,11 +200,11 @@ export default {
         "content": {}
       })
       console.log(1);
-      
+
     },
     /*安全配置信息*/
     async querySite_Parameter () {
-      
+
       const res = await this.$api.requested({
         "classname": "webmanage.site.site",
         "method": "querySite_Parameter",
@@ -306,4 +306,4 @@ export default {
 .color-yellow{
   color: #FA8C16;
 }
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -287,7 +287,7 @@ export default {
           value:this.mainData.agentname
         },
       ]
-      if (this.$route.query.portrait !== ''){
+      if (this.$route.query.portrait != ''){
         this.$refs.mindmap.onShow()
       }
     },

src/SManagement/archives_admag/index.vue

@@ -12,7 +12,7 @@
               <p style="font-size:14px;margin-right:10px;width:50px">范围:</p>
               <el-select v-model="params.content.where.type" placeholder="请选择素材范围" size="small" @change="getFileList">
                 <el-option
-                  label="全部"
+                  label="总部"
                   :value="0">
                 </el-option>
                 <el-option
@@ -28,7 +28,7 @@
               </span> -->
             </filterList>
           </div>
-          
+
           <!--素材列表-->
           <list :fileData="fileData" @listItemClick="listItemClick"
             v-if="tool.checkAuth($route.name, 'read')">
@@ -123,7 +123,7 @@ export default {
       currentFile: ''
     };
   },
-  
+
   computed: {
     ...mapGetters({
       DrawerShow:'DrawerShow'
@@ -173,7 +173,7 @@ export default {
       this.total = res.total
       this.fileData = res.data
       console.log(this.fileData);
-      
+
       this.fileData.forEach((item) => {
         item.attinfos = matchingFileType.fileList(item.attinfos)
       })
@@ -281,4 +281,4 @@ export default {
   bottom: 0;
   margin-top: 16px;
 }
-</style>
+</style>

src/SManagement/archives_upload/index.vue

@@ -5,7 +5,7 @@
       <save type="save" @click.native="save()"></save>
     </Header>-->
     <el-row>
-      <el-col :span="14">
+      <el-col :span="24">
         <!--标题 分类-->
         <Set ref="set" @setSelectChange="selectChange" @setTitleChange="titleChange" />
         <!--文件列表-->
@@ -29,7 +29,7 @@
         </file-text>
       </el-col>
       <!-- 授权范围 -->
-      <el-col :span="10">
+<!--      <el-col :span="10">
         <scopeOfauth
           style="margin-left:10px;"
           :defaultData="defaultData"
@@ -38,7 +38,7 @@
           obiectName="sat_sharematerialid"
           @onChecked="onChecked"
         />
-      </el-col>
+      </el-col>-->
     </el-row>
     <div class="fixed__btn__panel">
       <el-button size="small" @click="$store.dispatch('DrawerShowChange',false)" class="normal-btn-width">取 消</el-button>
@@ -77,6 +77,7 @@ export default {
           "sat_sharematerial_classid": 9999,
           "notes": "",
           "tag": [],
+          "isonlymanager_dept":0,
           "canfiledownload": 1,
           "content": "",
           "sat_sharematerialid": 0,
@@ -127,7 +128,7 @@ export default {
       setTimeout(() => {
         let data = JSON.parse(window.sessionStorage.getItem("newMaterial"))
         console.log(data);
-        
+
         this.cacheInfo.content.sat_sharematerialid = data.sat_sharematerialid
         this.cacheInfo.content.title = data.title
         this.cacheInfo.content.sat_sharematerial_classid = data.sat_sharematerial_classid
@@ -138,7 +139,7 @@ export default {
         this.uploadCacheData.sat_sharematerialid = data.sat_sharematerialid
         this.uploadCacheData.attinfos = data.attinfos
         this.authId = this.$route.query.id
-        
+
         setTimeout(this.randerData, 100)
         if (data.title != '') this.uploadCacheData.status = "完成"
         this.query_auth()
@@ -166,13 +167,13 @@ export default {
           }
           this.cacheInfo.content.type = this.uploadType
           console.log(this.cacheInfo);
-          
+
           //判断所属ID是否为初始ID
           if (this.cacheInfo.content.sat_sharematerial_classid == '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid) return this.$message.error('请选择素材分类')
           this.$api.requested(this.cacheInfo).then(res => {
             this.tool.showMessage(res, () => {
               this.uploadCacheData.status = '完成'
-              this.insertCoursewareauth()
+             /* this.insertCoursewareauth()*/
               this.$store.dispatch('DrawerShowChange',false)
               this.$router.back()
               this.$emit('onSuccess')

src/components/mindmap/custom.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="background:#f1f2f3;" id="full" :style="contentStyle">
-    <img style="width: 25px; height: 25px;float: right" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
-    <img style="width: 25px; height: 25px;float: right" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
-    <div  id="container">
+  <div style="background:#f1f2f3;overflow: auto;" id="full" :style="divStyle">
+    <img style="width: 25px; height: 25px;float: left" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
+    <img style="width: 25px; height: 25px;float: left" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
+    <div  id="container" :style="contentStyle">
     </div>
     <el-drawer
         :visible.sync="drawer"
@@ -12,9 +12,10 @@
       <p style="padding: 10px 0px 0px 10px">{{title}}</p>
 <!--      <el-divider></el-divider>-->
       <contractInfo v-if="title == '合同列表'" :data="tableData"></contractInfo>
-      <projectInfo v-if="title == '项目列表'" :data="tableData"></projectInfo>
+      <projectInfo v-if="title == '项目列表'" :data="tableData" :isList="isList"></projectInfo>
       <orderInfo v-if="title == '订单列表'" :data="tableData"></orderInfo>
       <serviceInfo v-if="title == '服务列表'" :data="tableData"></serviceInfo>
+      <contactsInfo v-if="title == '联系人列表'" :data="tableData"></contactsInfo>
     </el-drawer>
   </div>
 </template>
@@ -25,6 +26,7 @@ import contractInfo from "@/components/mindmap/modules/contractInfo";
 import projectInfo from "@/components/mindmap/modules/projectInfo";
 import orderInfo from "@/components/mindmap/modules/orderInfo";
 import serviceInfo from "@/components/mindmap/modules/serviceInfo";
+import contactsInfo from "@/components/mindmap/modules/contactsInfo";
 import G6 from '@antv/g6';
 let graph;
 
@@ -377,7 +379,7 @@ G6.registerNode('card-node', {
   setState: nodeBasicMethod.setState,
 });
 export default {
-  props:['id','contentStyle'],
+  props:['id','contentStyle','show','divStyle','isList'],
   data () {
     return {
       fullscreen:false,
@@ -386,19 +388,24 @@ export default {
       tableData: []
     }
   },
-  components:{detailsInfo,contractInfo,projectInfo,orderInfo,serviceInfo},
+  components:{detailsInfo,contractInfo,projectInfo,orderInfo,serviceInfo,contactsInfo},
   mounted () {
     // this.getData()
+    if (this.show === '1'){
+      this.getData()
+    }
+
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
+    console.log(this.id,'00000')
   },
   methods:{
     createMenu (array) {
       var that = this
       let arr = []
-      const HASLINKS = ['项目','合同','服务工单数','订单','服务']
+      const HASLINKS = ['项目','合同','服务工单数','订单','服务','联系人']
       function convertToElementTree(node) {
         // 新节点
         var elNode = {
@@ -427,7 +434,7 @@ export default {
       });
       return arr
     },
-    
+
     async getData () {
       var that = this
       const res = await this.$api.requested({
@@ -438,6 +445,7 @@ export default {
       })
       // this.data = this.createMenu([res.data.data])
       const container = document.getElementById('container');
+      console.log(container,'container')
       const width = container.scrollWidth;
       const height = container.scrollHeight -50 || 500;
       const contextMenu = new G6.Menu({
@@ -466,6 +474,7 @@ export default {
 
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,
@@ -508,17 +517,18 @@ export default {
         this.tableData = item._cfg.model.data
         console.log(this.tableData,'表格订单')
         this.title = item._cfg.model.label + '列表'
-        if (item._cfg.model.label == '合同' || item._cfg.model.label == '项目' || item._cfg.model.label == '订单' || item._cfg.model.label == '服务'){
+        if (item._cfg.model.label == '合同' || item._cfg.model.label == '项目' || item._cfg.model.label == '订单' || item._cfg.model.label == '服务' || item._cfg.model.label == '联系人'){
           this.drawer = true
         }
       })
-      
+
       if (typeof window !== 'undefined')
         window.onresize = () => {
           if (!graph || graph.get('destroyed')) return;
           if (!container || !container.scrollWidth || !container.scrollHeight) return;
           graph.changeSize(container.scrollWidth, container.scrollHeight);
         };
+
       if (this.$route.query.portrait === 'ht'){
         res.data.children.forEach(item=>{
           if (item.name === '合同'){

src/components/mindmap/index.vue

@@ -6,9 +6,9 @@
       append-to-body
       size="90%"
       :with-header="false">
-      <custom :contentStyle="{height:'100vh',width:'100vw'}" ref="custom" v-if="name === 'custom'" :id="id"/>
-      <project :contentStyle="{height:'100vh',width:'100vw'}" ref="project" v-else-if="name === 'project'" :id="id"/>
-      <saler :contentStyle="{height:'100vh',width:'100vw'}" ref="saler" v-else :id="id"/>
+      <custom :contentStyle="{height:'100vh',width:'100vw'}" :divStyle="{height:'100vh',width:'100vw'}" ref="custom" v-if="name === 'custom'" :id="id"/>
+      <project :contentStyle="{height:'100vh',width:'100vw'}" :divStyle="{height:'100vh',width:'100vw'}" ref="project" v-else-if="name === 'project'" :id="id"/>
+      <saler :contentStyle="{height:'100vh',width:'100vw'}" :divStyle="{height:'100vh',width:'100vw'}" ref="saler" v-else :id="id"/>
     </el-drawer>
 
   </div>

src/components/mindmap/modules/contactsInfo.vue

@@ -0,0 +1,84 @@
+<template>
+  <div style="padding: 10px 0px 0px 10px">
+      <el-table
+          :data="data"
+          border
+          height="calc(100vh - 60px)"
+          style="width: 100%">
+        <el-table-column
+            prop="name"
+            label="姓名"
+            width="0">
+        </el-table-column>
+        <el-table-column
+            prop="wechatnum"
+            label="微信"
+            width="0">
+        </el-table-column>
+        <el-table-column
+            prop="phonenumber"
+            label="手机号"
+            width="0">
+<!--            <template slot-scope="scope">
+              <span>{{tool.formatAmount(scope.row.signamount,2)}}</span>
+            </template>-->
+        </el-table-column>
+        <el-table-column
+            prop="depname"
+            label="部门"
+            width="0">
+<!--          <template slot-scope="scope">
+            <span >{{tool.formatAmount(scope.row.discountrate * 100,2)}}%</span>
+          </template>-->
+        </el-table-column>
+        <el-table-column
+            prop="position"
+            label="职位"
+            width="100">
+        </el-table-column>
+<!--        <el-table-column
+            prop="operation"
+            width="100"
+            label="操作">
+          <template slot-scope="scope">
+            &lt;!&ndash;              <el-input v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>&ndash;&gt;
+            <el-button size="mini" type="text" @click="rowChange(scope.row)">详 情</el-button>
+            &lt;!&ndash;              <detailsInfo :row="scope.row"></detailsInfo>&ndash;&gt;
+          </template>
+        </el-table-column>-->
+      </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "contractInfo",
+  props:['data'],
+  methods:{
+    rowChange(data){
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        let route = this.$route
+        route.query.portrait = 'xm'
+        console.log(route,'route')
+        if (route.path !== '/projectChangeDetail') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({
+          path:'/projectChangeDetail',
+          query:{
+            id:data.sa_projectid,
+            rowindex:data.rowindex,
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/mindmap/modules/projectEvaluation.vue

@@ -0,0 +1,99 @@
+<template>
+  <div style="padding: 10px 0px 0px 10px">
+      <el-table
+          :data="data"
+          border
+          height="calc(100vh - 60px)"
+          style="width: 100%">
+        <el-table-column
+            prop="name"
+            label="评估人"
+            width="0">
+        </el-table-column>
+        <el-table-column
+            prop="depname"
+            label="部门"
+            width="0">
+        </el-table-column>
+        <el-table-column
+            prop="position"
+            label="职位"
+            width="0">
+<!--            <template slot-scope="scope">
+              <span>{{tool.formatAmount(scope.row.signamount,2)}}</span>
+            </template>-->
+        </el-table-column>
+        <el-table-column
+            prop="taskname"
+            label="评估任务"
+            width="300">
+<!--          <template slot-scope="scope">
+            <span >{{tool.formatAmount(scope.row.discountrate * 100,2)}}%</span>
+          </template>-->
+        </el-table-column>
+        <el-table-column
+            prop="enterprisename"
+            label="评估对象"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            prop="optionname"
+            label="评估结果"
+            width="100">
+        </el-table-column>
+        <el-table-column
+            prop="actionnotes"
+            label="评估说明"
+            width="300">
+        </el-table-column>
+        <el-table-column
+            prop="createdate"
+            label="评估时间"
+            width="200">
+        </el-table-column>
+<!--        <el-table-column
+            prop="operation"
+            width="100"
+            label="操作">
+          <template slot-scope="scope">
+            &lt;!&ndash;              <el-input v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>&ndash;&gt;
+            <el-button size="mini" type="text" @click="rowChange(scope.row)">详 情</el-button>
+            &lt;!&ndash;              <detailsInfo :row="scope.row"></detailsInfo>&ndash;&gt;
+          </template>
+        </el-table-column>-->
+      </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "contractInfo",
+  props:['data'],
+  methods:{
+    rowChange(data){
+      this.$store.dispatch('changeDetailDrawer',false)
+      setTimeout(()=>{
+        let route = this.$route
+        route.query.portrait = 'xm'
+        console.log(route,'route')
+        if (route.path !== '/projectChangeDetail') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({
+          path:'/projectChangeDetail',
+          query:{
+            id:data.sa_projectid,
+            rowindex:data.rowindex,
+          }
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      },500)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/mindmap/project.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="background:#f1f2f3" id="full" :style="contentStyle">
-    <img style="width: 25px; height: 25px;float: right" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
-    <img style="width: 25px; height: 25px;float: right" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
-    <div id="container"></div>
+  <div style="background:#f1f2f3" id="full" :style="divStyle">
+    <img style="width: 25px; height: 25px;float: left" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
+    <img style="width: 25px; height: 25px;float: left" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
+    <div id="container" :style="contentStyle"></div>
     <el-drawer
         :visible.sync="drawer"
         append-to-body
@@ -13,6 +13,7 @@
       <customInfo v-if="title == '关联客户列表'" :data="tableData"></customInfo>
       <contractInfo v-if="title == '合同列表'" :data="tableData"></contractInfo>
       <quotationInfo v-if="title == '报价列表'" :data="tableData"></quotationInfo>
+      <projectEvaluation v-if="title == '评估记录列表'" :data="tableData"></projectEvaluation>
     </el-drawer>
   </div>
 </template>
@@ -22,6 +23,7 @@ import competitorInfo from "@/components/mindmap/modules/competitorInfo";
 import customInfo from "@/components/mindmap/modules/customInfo";
 import contractInfo from "@/components/mindmap/modules/contractInfo";
 import quotationInfo from "@/components/mindmap/modules/quotationInfo";
+import projectEvaluation from "@/components/mindmap/modules/projectEvaluation";
 import G6 from '@antv/g6';
 import axios from 'axios'
 let graph;
@@ -376,8 +378,8 @@ G6.registerNode('card-node', {
   setState: nodeBasicMethod.setState,
 });
 export default {
-  props:['id','contentStyle'],
-  components:{competitorInfo,customInfo,contractInfo,quotationInfo},
+  props:['id','contentStyle','show','divStyle'],
+  components:{competitorInfo,customInfo,contractInfo,quotationInfo,projectEvaluation},
   data () {
     return {
       fullscreen:false,
@@ -388,6 +390,9 @@ export default {
   },
   mounted () {
     // this.getData()
+    if (this.show === '1'){
+      this.getData()
+    }
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
@@ -397,7 +402,7 @@ export default {
     createMenu (array) {
       var that = this
       let arr = []
-      const HASLINKS = ['关联客户','竞争对手','报价单有效数','合同有效数','报价','合同']
+      const HASLINKS = ['关联客户','竞争对手','报价单有效数','合同有效数','报价','合同','评估记录']
       function convertToElementTree(node) {
         // 新节点
         var elNode = {
@@ -463,6 +468,7 @@ export default {
 
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,
@@ -481,7 +487,7 @@ export default {
           type: 'dendrogram',
           direction: 'RL',
           nodeSep: 100,
-          rankSep: 350,
+          rankSep: 500,
           radial: true,
         },
       });
@@ -500,7 +506,7 @@ export default {
         console.log(item._cfg.model,'点击列表')
         this.tableData = item._cfg.model.data
         this.title = item._cfg.model.label + '列表'
-        if (item._cfg.model.label == '竞争对手' || item._cfg.model.label == '关联客户' || item._cfg.model.label == '报价' || item._cfg.model.label == '合同'){
+        if (item._cfg.model.label == '竞争对手' || item._cfg.model.label == '关联客户' || item._cfg.model.label == '报价' || item._cfg.model.label == '合同' || item._cfg.model.label == '评估记录'){
           this.drawer = true
         }
       })

src/components/mindmap/saler.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="background:#f1f2f3" id="full" :style="contentStyle">
-    <img style="width: 25px; height: 25px;float: right" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
-    <img style="width: 25px; height: 25px;float: right" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
-    <div id="container"></div>
+  <div style="background:#f1f2f3" id="full" :style="divStyle">
+    <img style="width: 25px; height: 25px;float: left" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
+    <img style="width: 25px; height: 25px;float: left" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
+    <div id="container" :style="contentStyle"></div>
     <el-drawer
         :visible.sync="drawer"
         append-to-body
@@ -378,7 +378,7 @@ G6.registerNode('card-node', {
   setState: nodeBasicMethod.setState,
 });
 export default {
-  props:['id','contentStyle'],
+  props:['id','contentStyle','show','divStyle'],
   components:{customerCount,contractCount,clueCount,projectQuotation,customQuotation,projectAssociation},
   data () {
     return {
@@ -390,6 +390,9 @@ export default {
   },
   mounted () {
     // this.getData()
+    if (this.show === '1'){
+      this.getData()
+    }
     document.addEventListener('fullscreenchange', this.handleFullscreenChange);
     document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
     document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
@@ -463,6 +466,7 @@ export default {
       });
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,

src/store/index.js

@@ -51,7 +51,7 @@ export default new Vuex.Store({
     isRouterAlive:state => state.isRouterAlive,
     pageCache: state => state.pageCache,
     svlistData:state => state.svlistData,
-    
+
   },
   mutations: {
     setLoading(state,value) {
@@ -84,12 +84,12 @@ export default new Vuex.Store({
     sendDataToForm (state,data) {
       state.dataToForm = data
     },
-    
+
     setActiveApp (state,data) {
       //头部区域搜索所传入的数值
       state.searchValue = data.val
 
-      
+
       data.app?sessionStorage.setItem('activeApp',JSON.stringify(data.app)):''
       state.appname = data.name
       state.activeApp = JSON.parse(sessionStorage.getItem('activeApp'))
@@ -146,10 +146,10 @@ export default new Vuex.Store({
         const res = await api.requested(obj)
 
         commit('setSelectList',res)
-        
+
         reslove(res)
       })
-      
+
     },
     // 查询站点信息
     async querySiteInfo ({commit}, param) {
@@ -199,7 +199,7 @@ export default new Vuex.Store({
       })
       commit('setUsershortcuts',arr)
     },
-    // 设置应用快捷栏 
+    // 设置应用快捷栏
     async setAppMenu ({commit}, param) {
       const res = await api.requested({
         "classname": "sysmanage.develop.userauthforweb.userauth",
@@ -244,7 +244,7 @@ export default new Vuex.Store({
     getModules ({commit}, data) {
       if (data.type === 'system') {
         commit('setActiveApp',{name:data.mod[0].apps[0].systemappname,app:data.mod[0].apps[0],val:''})
-        
+
         sessionStorage.setItem('active_modules',JSON.stringify(data.mod[0]))
 
         let inactivePath = data.mod[0].apps[0].path