数据看板调整

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,12 +19,12 @@
                     <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">
@@ -64,12 +64,12 @@
                     <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">
@@ -91,7 +91,7 @@
                     <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.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) + '万'}}
@@ -143,7 +143,7 @@
 <!--                       {{'¥'+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)}}
+                       ¥ {{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) + '万'}}
@@ -175,12 +175,12 @@
                     <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">
@@ -227,12 +227,12 @@
                     <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">
@@ -257,7 +257,7 @@
 <!--                       {{'¥'+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.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) + '万'}}
@@ -278,12 +278,12 @@
                     <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">
@@ -308,7 +308,7 @@
 <!--                       {{'¥'+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.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) + '万'}}
@@ -341,12 +341,12 @@
                     <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">
@@ -391,12 +391,12 @@
                     <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">
@@ -422,7 +422,7 @@
 <!--                        {{'¥'+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.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) + '万'}}
@@ -443,12 +443,12 @@
                     <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">
@@ -474,7 +474,7 @@
 <!--                         {{'¥'+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.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) + '万'}}

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: '无权限操作',

vue.config.js

@@ -14,12 +14,12 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'http://61.164.207.46:8000',  // target host*/
           // target: 'http://192.168.3.9:8080',  // target host*!
           // target: 'http://192.168.3.13:8080',  // target host*!
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // 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 = {
         },
       }
     }
-}
+}