代码上传

src/HDrpManagement/dataanalysis/index.vue

@@ -268,5 +268,9 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/.content {
+  padding: 0px;
+  box-sizing: border-box;
+  margin-bottom: 10px;
+}
 </style>

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -19,19 +19,19 @@
                     <el-col class="title-fonts">订单目标</el-col>
                   </el-row>
                   <el-row :gutter="20" >
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount<-100000000?tool.formatAmount(listby.unamount/100000000,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 >10000 ? tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2)+'亿':tool.formatAmount(listby.unamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -43,8 +43,12 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-                      {{'¥'+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.amount>10000 ?tool.formatAmount(listby.amount/10000,2) + '万':listby.amount>100000000?tool.formatAmount(listby.amount/100000000,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) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -60,17 +64,17 @@
                     <el-col class="title-fonts">出货目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcoutamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listby.unoutamount/10000,2)+'万':listby.unoutamount<-100000000?tool.formatAmount(listby.unoutamount/100000000,2)+'亿':tool.formatAmount(listby.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listby.unoutamount,2)}}-->
@@ -86,9 +90,13 @@
                   <el-row>
                     <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)}}
+                      </span>
+                      <span>
+                        /¥ {{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)}}-->
-                       {{'¥'+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>
                     </el-col>
                   </el-row>
@@ -105,17 +113,17 @@
                     <el-col class="title-fonts">开票目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listby.wcinvoiceamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':listby.uninvoiceamount<-100000000?tool.formatAmount(listby.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listby.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}-->
@@ -132,8 +140,14 @@
                     <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) + '万'}}
+<!--                       {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -161,17 +175,17 @@
                     <el-col class="title-fonts">订单目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listbj.unamount/10000,2)+'万':listbj.unamount<-100000000?tool.formatAmount(listbj.unamount/100000000,2)+'亿':tool.formatAmount(listbj.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbj.unamount,2)}}-->
@@ -189,8 +203,14 @@
                     <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) + '万'}}
+<!--                       {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -207,17 +227,17 @@
                     <el-col class="title-fonts">出货目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcoutamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <div style="float: right">
                          <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<-10000 ?tool.formatAmount(listbj.unoutamount/10000,2)+'万':listbj.unoutamount<-100000000?tool.formatAmount(listbj.unoutamount/100000000,2)+'亿':tool.formatAmount(listbj.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbj.unoutamount,2)}}-->
@@ -234,8 +254,14 @@
                     <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) + '万'}}
+<!--                       {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -252,17 +278,17 @@
                     <el-col class="title-fonts">开票目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbj.wcinvoiceamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <div style="float: right">
                         <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<-10000 ?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':listbj.uninvoiceamount<-100000000?tool.formatAmount(listbj.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbj.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbj.uninvoiceamount,2)}}-->
@@ -279,8 +305,14 @@
                     <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) + '万'}}
+<!--                       {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -309,17 +341,17 @@
                     <el-col class="title-fonts">订单目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listbn.unamount/10000,2)+'万':listbn.unamount<-100000000?tool.formatAmount(listbn.unamount/100000000,2)+'亿':tool.formatAmount(listbn.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbn.unamount,2)}}-->
@@ -336,8 +368,14 @@
                     <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) + '万'}}
+<!--                       {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -353,17 +391,17 @@
                     <el-col class="title-fonts">出货目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcoutamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listbn.unoutamount/10000,2)+'万':listbn.unoutamount<-100000000?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':tool.formatAmount(listbn.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbn.unoutamount,2)}}-->
@@ -381,8 +419,14 @@
                     <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) + '万'}}
+<!--                        {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>
@@ -399,17 +443,17 @@
                     <el-col class="title-fonts">开票目标</el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="5">
                     <span style="font-size: 18px;padding: 0 0 0 5px">
                       {{tool.formatAmount(listbn.wcinvoiceamount * 100,2) + '%'}}
                     </span>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="19">
                       <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<-10000 ?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':listbn.uninvoiceamount<-100000000?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbn.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
 <!--                            ¥{{tool.formatAmount(listbn.uninvoiceamount,2)}}-->
@@ -427,8 +471,14 @@
                     <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) + '万'}}
+<!--                         {{'¥'+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)}}
+                      </span>
+                      <span>
+                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                      </span>
                     </span>
                     </el-col>
                   </el-row>

src/HDrpManagement/projectChange/components/putPeople.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
     <el-button class="inline-16" v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" size="mini" :type="!disabled || rowData.status === '已失败' ?'':'primary'" slot="reference" @click="onSubmit" :disabled="!disabled || rowData.status === '已失败'">提交报备</el-button>
-    <el-button class="inline-16" v-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" size="mini" type="primary" slot="reference" @click="onCheck" :disabled="rowData.status === '已失败'" :type="rowData.status === '已失败' ?'':'primary'">报备审核</el-button>
-    <el-button class="inline-16" v-if="flag === 2 && tool.checkAuth($route.name,'putBack') " size="mini" type="primary" slot="reference"  @click="onUnCheck" :disabled="rowData.status === '已失败'" :type="rowData.status === '已失败' ?'':'primary'">报备驳回(退回)</el-button>
-    <el-drawer
+    <el-button  v-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" size="mini" type="primary" slot="reference" @click="onCheck" :disabled="rowData.status === '已失败'" :type="rowData.status === '已失败' ?'':'primary'">报备审核</el-button>
+    <el-button class="inline-16" v-if="(flag === 2 || flag === 1) && tool.checkAuth($route.name,'putBack') " size="mini" type="primary" slot="reference"  @click="onUnCheck" :disabled="rowData.status === '已失败'" :type="rowData.status === '已失败' ?'':'primary'">报备驳回(退回)</el-button>
+<!--    <el-drawer
         :visible.sync="drawer"
         append-to-body
         size="90%"
         @close="onClose"
         :with-header="false">
       <report :url="url"></report>
-    </el-drawer>
+    </el-drawer>-->
   </div>
 </template>
 
@@ -72,7 +72,8 @@ export default {
         })
         this.url = res.data
         if (this.url){
-          this.drawer = true
+          /*this.drawer = true*/
+          window.open(this.url)
         }else {
           this.$message({
             message: '无权限操作',

src/components/mindmap/custom.vue

@@ -68,10 +68,10 @@ const getNodeConfig = (node) => {
   switch (node.type) {
     case 'root': {
       config = {
-        basicColor: '#E3E6E8',
+        basicColor: node.color,
         fontColor: 'rgba(0,0,0,0.85)',
         borderColor: '#E3E6E8',
-        bgColor: '#5b8ff9',
+        bgColor: node.color,
       };
       break;
     }
@@ -439,7 +439,7 @@ export default {
       // this.data = this.createMenu([res.data.data])
       const container = document.getElementById('container');
       const width = container.scrollWidth;
-      const height = container.scrollHeight || 500;
+      const height = container.scrollHeight -50 || 500;
       const contextMenu = new G6.Menu({
         getContent(evt) {
           let info = evt.item._cfg.model.info
@@ -485,7 +485,7 @@ export default {
           type: 'dendrogram',
           direction: 'RL',
           nodeSep: 100,
-          rankSep: 500,
+          rankSep: 330,
           radial: true,
         },
       });
@@ -607,6 +607,8 @@ export default {
 </script>
 <style>
 #container{
+   width: 100vw;
+  height:100vh;
   position: relative;
 }
 #contextMenu {

src/components/mindmap/project.vue

@@ -436,7 +436,7 @@ export default {
 
       const container = document.getElementById('container');
       const width = container.scrollWidth;
-      const height = container.scrollHeight - 100 || 500;
+      const height = container.scrollHeight - 50 || 500;
       const contextMenu = new G6.Menu({
         getContent(evt) {
           let info = evt.item._cfg.model.info
@@ -481,7 +481,7 @@ export default {
           type: 'dendrogram',
           direction: 'RL',
           nodeSep: 100,
-          rankSep: 500,
+          rankSep: 350,
           radial: true,
         },
       });
@@ -595,6 +595,8 @@ export default {
 </script>
 <style>
 #container{
+  width: 100vw;
+  height:100vh;
   position: relative;
 }
 #contextMenu {

src/components/mindmap/saler.vue

@@ -437,7 +437,7 @@ export default {
       })
       const container = document.getElementById('container');
       const width = container.scrollWidth;
-      const height = container.scrollHeight || 500;
+      const height = container.scrollHeight -50 || 500;
       const contextMenu = new G6.Menu({
         getContent(evt) {
           let info = evt.item._cfg.model.info
@@ -481,7 +481,7 @@ export default {
           type: 'dendrogram',
           direction: 'RL',
           nodeSep: 100,
-          rankSep: 550,
+          rankSep: 520,
           radial: true,
         },
       });
@@ -615,6 +615,8 @@ export default {
 </script>
 <style>
 #container{
+   width: 100vw;
+  height:100vh;
   position: relative;
 }
 #contextMenu {

vue.config.js

@@ -19,7 +19,7 @@ module.exports = {
           // target: 'http://192.168.3.13:8080',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
-          ws: true,  // proxy websockets 
+          ws: true,  // proxy websockets
           changeOrigin: true,  // needed for virtual hosted sites
           pathRewrite: {
             '^/apis': ''  // rewrite path
@@ -27,4 +27,4 @@ module.exports = {
         },
       }
     }
-}
+}