发票记录新增跳转功能，预计成交统计样式调整

src/HDrpManagement/orderManage/details/tabs/invoiceTable.vue

@@ -17,6 +17,11 @@
           prop="billno"
           :label="$t(`开票单号`)"
           width="180">
+        <template slot-scope="scope">
+          <el-button type="text" @click="detailGo(scope.row)">
+            {{ scope.row.billno }}
+          </el-button>
+        </template>
       </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
@@ -153,6 +158,21 @@ export default {
         this.listData()
         this.dialogFormVisible = false
       })
+    },
+    /*跳转*/
+    detailGo(row){
+      let route = this.$route
+      if (route.path !== '/invoiceDetail') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:'/invoiceDetail',
+        query:{
+          id:row.sa_invoiceapplyid,
+          rowindex:row.rowindex,
+        }
+      })
     }
   },
   mounted () {

src/SDrpManagement/agentOrder/details/tabs/invoiceTable.vue

@@ -17,6 +17,11 @@
           prop="billno"
           :label="$t(`开票单号`)"
           width="180">
+        <template slot-scope="scope">
+          <el-button type="text" @click="detailGo(scope.row)">
+            {{ scope.row.billno }}
+          </el-button>
+        </template>
       </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
@@ -154,6 +159,21 @@ export default {
         this.listData()
         this.dialogFormVisible = false
       })
+    },
+    /*跳转*/
+    detailGo(row){
+      let route = this.$route
+      if (route.path !== '/sinvoiceDetail') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:'/sinvoiceDetail',
+        query:{
+          id:row.sa_invoiceapplyid,
+          rowindex:row.rowindex,
+        }
+      })
     }
   },
   mounted () {

src/SDrpManagement/salerOrder/details/tabs/invoiceTable.vue

@@ -15,6 +15,11 @@
           prop="billno"
           :label="$t(`开票单号`)"
           width="180">
+        <template slot-scope="scope">
+          <el-button type="text" @click="detailGo(scope.row)">
+            {{ scope.row.billno }}
+          </el-button>
+        </template>
       </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
@@ -187,6 +192,21 @@ export default {
         this.dialogFormVisible = false;
       });
     },
+    /*跳转*/
+    detailGo(row){
+      let route = this.$route
+      if (route.path !== '/sinvoiceDetail_saler') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:'/sinvoiceDetail_saler',
+        query:{
+          id:row.sa_invoiceapplyid,
+          rowindex:row.rowindex,
+        }
+      })
+    }
   },
   mounted() {
     this.listData();

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -86,10 +86,10 @@
           @onSuccessTag="onSuccessTag"
         ></duplicatesCustomer>
         <confirmSelection class="inline-16" content="暂缓的客户将不计入客户相关数据统计，是否确定暂缓该客户" btn-title="暂缓" btn-type="primary" confirm-button-text="确定暂缓" cancel-button-text="取消"
-                          paramId="20221010164602" @onSuccess="queryMainData();$refs.details.$refs.tag.queryTag();$refs.baseDetail.basicData()" v-if="tool.checkAuth($route.name,'putOff') && mainData.status != '暂缓'"
+                          paramId="20221010164602" @onSuccess="queryMainData();$refs.details.$refs.tag.queryTag();$refs.baseDetail.basicData()" v-if="tool.checkAuth($route.name,'putOff') && mainData.status != '暂缓' && mainData.disabled"
         ></confirmSelection>
         <confirmSelection class="inline-16" content="是否确定取消暂缓并继续跟进客户" btn-title="取消暂缓" btn-type="primary" confirm-button-text="取消暂缓" cancel-button-text="关闭"
-                          paramId="20221010164602" @onSuccess="queryMainData();$refs.details.$refs.tag.queryTag();$refs.baseDetail.basicData()" v-if="tool.checkAuth($route.name,'putOff') && mainData.status == '暂缓'"
+                          paramId="20221010164602" @onSuccess="queryMainData();$refs.details.$refs.tag.queryTag();$refs.baseDetail.basicData()" v-if="tool.checkAuth($route.name,'putOff') && mainData.status == '暂缓' && mainData.disabled"
         ></confirmSelection>
         <to_void
           class="inline-16"

src/template/chartG2Template/Column.vue

@@ -24,7 +24,7 @@ export default {
       this.chartMapData = res.data
       this.chartMapData = res.data.map(item=>{
         return {
-          "signamount_due":this.tool.unitConversion(item.signamount_due,10000),
+          "signamount_due":Math.round(this.tool.unitConversion(item.signamount_due,10000) * 100)/100,
           "signdate_due":item.signdate_due
         }
       })
@@ -44,6 +44,14 @@ export default {
             formatter: (datum) =>{
               return '¥' + this.tool.formatAmount(datum.signamount_due,2)
             }
+          },
+          tooltip: {
+            formatter: (datum) => {
+              return {
+                name:datum.signdate_due,
+                value:'¥' + this.tool.formatAmount(datum.signamount_due,2)
+              }
+            }
           }
         })
         this.chartMap.render();

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -95,6 +95,21 @@
           <div style="margin: 10px 20px 10px 20px">
             <div class="statistics-box-title">
               {{$t(`前12个月总数据`)}}
+              <el-tooltip effect="dark" placement="top-start">
+                <div slot="content">
+                  {{
+                    $t(
+                        "统计当前月份之前（不包含当前月份）的12个月的（已成交、结案状态）的项目预计成交准确率、偏差金额"
+                    )
+                  }}
+                </div>
+                <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
+                <img
+                    width="14px"
+                    height="14px"
+                    src="../../../assets/icons/prompt_icon.svg"
+                />
+              </el-tooltip>
             </div>
             <div class="title-margin-15">
               <div class="title-font-style1">
@@ -110,7 +125,7 @@
               </div>
               <div class="title-margin-5 title-font-style2">
                 {{tool.formatAmount(tool.unitConversion(previousYearData.totaldeviationamount,10000),2)}}
-                <span class="title-font-style4">{{$t(``)}}万元</span>
+                <span class="title-font-style4">{{$t(`万元`)}}</span>
               </div>
             </div>
             <div class="title-margin-15">
@@ -137,6 +152,21 @@
           <div style="margin: 20px">
             <div class="title-font-style5">
               {{$t(`未来12月项目预计签约金额统计（单位：万）`)}}
+              <el-tooltip effect="dark" placement="top-start">
+                <div slot="content">
+                  {{
+                    $t(
+                        "统计当前月份往后（包含当前月份）的12个月的每个月份的（跟进中状态）的项目预计签约金额"
+                    )
+                  }}
+                </div>
+                <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
+                <img
+                    width="14px"
+                    height="14px"
+                    src="../../../assets/icons/prompt_icon.svg"
+                />
+              </el-tooltip>
             </div>
             <div style="margin-top: 10px">
               <chartTemplate ref="chartColumn" chartRef="signChart" :param="paramChart" height-chart="232px" width-chart="100%"></chartTemplate>
@@ -145,7 +175,7 @@
         </div>
       </div>
     </div>
-    <div style="margin-top: 20px">
+    <div style="margin-top: 40px">
       <p class="title">{{projectTile}}</p>
       <tableTemp :layout="tablecols" :data="projectList" :opwidth="200" :custom="true" :height="tableHieght">
         <template v-slot:customcol="scope">
@@ -953,7 +983,7 @@ export default {
  /* height:calc(100vh)*/
 }
 .statistics-box{
-  width: 20%;
+  width: 25%;
   height: 302px;
   background: #FFFFFF;
   box-shadow: 0px 1px 6px 1px rgba(0,0,0,0.16);
@@ -971,7 +1001,7 @@ export default {
   text-transform: none;
 }
 .screen-box{
-  width: 78%;
+  width: 73%;
   height: 302px;
   background: #FFFFFF;
   box-shadow: 0px 1px 6px 1px rgba(0,0,0,0.16);

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -269,7 +269,6 @@ export default {
         ],
         tooltip: {
           formatter: (datum) => {
-            console.log(datum.value)
             return {
               name:datum.name,
               value:datum.name != '同比增长率'?'¥'+this.tool.formatAmount(datum.value,2):datum.value + '%'