build

src/components/newResults/company-month.vue

@@ -9,7 +9,7 @@
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:150px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
         <el-option v-for="depart in cp_companies" :key="depart.id" :value="depart.value" :label="depart.label" />
       </el-select>
 
@@ -20,7 +20,7 @@
 
     <el-row style="margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :cell-class-name="setCellClassName">
-        <el-table-column fixed="left" label="月度" prop="month" align="center" width="60px" />
+        <el-table-column fixed="left" label="月度" prop="month" align="center" width="45px" />
         <el-table-column label="当月营收目标" align="center" min-width="140px">
           <template slot-scope="scope">
             {{unit2TenThousand(scope.row.total_tips,isTenThound)}}
@@ -67,6 +67,8 @@
 <script>
 import asyncRequest from "@/api/newResults";
 import { unit2TenThousand, subtraction, multiplication, division, addition } from "../newReport/src/_utils";
+import { mapCompany } from "./mapCompany";
+
 export default {
   props:['companies','costField'],
   data(){
@@ -92,6 +94,7 @@ export default {
 
     this.isEmpty = this.cp_companies.length === 0;
     if(this.isEmpty) return;
+    this.cp_companies = this.cp_companies.map(item => ({ ...item, label:mapCompany[item.label] || item.label}))
 
     this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();

src/components/newResults/company.vue

@@ -3,18 +3,27 @@
     <div class="search clear" style="align-items: center;;">
       <el-switch style="margin-right: 10px;" v-model="isTenThound" active-text="万元" inactive-text="元" :disabled="isEmpty" />
 
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:145px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
         <el-option v-for="company in cp_companies" :key="company.value" :value="company.value" :label="company.label" />
       </el-select>
 
-      <el-date-picker class="fr picker" v-model="daytime" style=";width:150px" value-format="yyyy-MM-dd" :editable="false" :disabled="isEmpty"
+      <el-date-picker class="fr picker" v-model="daytime" style=";width:140px" value-format="yyyy-MM-dd" :editable="false" :disabled="isEmpty"
         :clearable="false" :size="'small'" format="yyyy-MM-dd" type="date" align="right" placeholder="选择日期"
         :picker-options="{ disabledDate(time) { return time.getTime() > Date.now(); } }" @change="requestData" />
     </div>
 
     <el-row style="margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :cell-class-name="setCellClassName">
-        <el-table-column fixed="left" label="业务公司" prop="companyName" align="center" width="190px" />
+        <el-table-column fixed="left" label="业务公司" prop="companyName" align="center" width="70px">
+          <template slot-scope="scope">
+            <div v-if="scope.row.companyName.indexOf('普润') === -1">{{scope.row.companyName}}</div>
+            <div v-else>
+              <p style="margin:0px">普润</p>
+              <p style="margin:0px">锦兴</p>
+              <p style="margin:0px">知事</p>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="当日营业收入" align="center" width="120px">
           <template slot-scope="scope">
             {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
@@ -135,6 +144,7 @@
 <script>
 import asyncRequest from "@/api/newResults";
 import { addition, unit2TenThousand, subtraction, multiplication, division } from "../newReport/src/_utils";
+import { mapCompany } from "./mapCompany";
 
 export default {
   props: ['companies', 'costField'],
@@ -167,8 +177,9 @@ export default {
     if (this.cp_companies.length === 4) this.cp_companies = [{ value: "", label: "所有公司" }, ...this.cp_companies];
     
     this.isEmpty = this.cp_companies.length === 0;
-
     if(this.isEmpty) return;
+
+    this.cp_companies = this.cp_companies.map(item => ({ ...item, label:mapCompany[item.label] || item.label}))
     
     this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();
@@ -180,7 +191,7 @@ export default {
       // Number(addition(c1.total_tips,c2.total_tips)).toFixed(2)
 
       return {
-        companyName: '普润&锦兴&知事',
+        companyName: '普润\n锦兴\n知事',
         cost_tips: Number(addition(c1.cost_tips, c2.cost_tips)).toFixed(2),
         total_tips: Number(c1.total_tips).toFixed(2),
         monthinfo: c1.monthinfo.map((item, index) => ({

src/components/newResults/department.vue

@@ -9,7 +9,7 @@
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:145px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
         <el-option 
           v-for="depart in companies" 
           :key="depart.value" 
@@ -24,7 +24,7 @@
         v-model="daytime" 
         :picker-options="{disbaledData(time) { return time.getTime() > Date.now(); }}" 
         placeholder="选择日期"
-        style=";width:150px" 
+        style=";width:140px" 
         value-format="yyyy-MM-dd" 
         format="yyyy-MM-dd" 
         :editable="false"
@@ -37,8 +37,14 @@
 
     <el-row style="margin-top: 10px; display: flex;" v-if="!isEmpty">
       <el-table border size="mini" :data="list" :span-method="spanMethod" :cell-class-name="setCellClassName">
-        <el-table-column fixed="left" label="公司" prop="company" align="center" width="140px" />
-        <el-table-column fixed="left" label="部门" prop="depart" align="center" width="140px" />
+        <el-table-column fixed="left" label="公司" prop="company" align="center" width="45px" />
+        <el-table-column fixed="left" label="部门" prop="depart" align="center" width="70px">
+          <template slot-scope="scope">
+            <p style="margin:0px" v-for="(chunk,index) in scope.row.depart.split('@')" :key="index">
+              {{chunk}}
+            </p>
+          </template>
+        </el-table-column>
         <el-table-column label="当日营业收入"  align="center" width="120px">
           <template slot-scope="scope">{{ unit2TenThousand(scope.row.dayinfo.sale_total,isTenThound) }}</template>
         </el-table-column>
@@ -111,6 +117,7 @@
 <script>
 import asyncRequest from "@/api/newResults";
 import setHeight from "@/mixins/index";
+import { mapCompany } from "./mapCompany"
 
 import { 
   addition, 
@@ -142,7 +149,7 @@ export default {
     this.isEmpty = this.companies.length === 0;
     if(this.isEmpty) return;
     this.companyNo = this.companies[0].value;
-
+    this.companies = this.companies.map(item => ({ ...item, label:mapCompany[item.label] || item.label}))
     this.daytime = this.transformTime();
     this.requestData();
   },

src/components/newResults/mapCompany.js

@@ -0,0 +1,7 @@
+export const mapCompany = {
+  "北京百辰荣达国际科贸有限公司":"百辰荣达",
+  "北京泓源广诚国际商贸有限公司":"泓源广诚",
+  "北京万宇恒通国际科贸有限公司":"万宇恒通",
+  "北京锦兴弘昌科技有限公司":"锦兴弘昌",
+  "北京普润心堂商贸有限公司":"普润心堂"
+}

src/pages/index.vue

@@ -15,12 +15,12 @@ export default {
   data(){
     return {
       routes:[
-        {label:'1.业绩报表', link:'/?path=results'},
-        {label:'2.利润看板', link:'/?path=report'},
-        {label:'3.应收账款', link:'/?path=accountsReceivable'},
-        {label:'4.订单情况', link:'/?path=newReport'},
-        {label:'5.发货情况', link:'/?path=stock'},
-        {label:'2024新业绩报表-测试',link:'/?path=newResults'}
+        {label:'1.业绩报表', link: '/?path=results'},
+        {label:'2.利润看板', link: '/?path=report'},
+        {label:'3.应收账款', link: '/?path=accountsReceivable'},
+        {label:'4.订单情况', link: '/?path=newReport'},
+        {label:'5.发货情况', link: '/?path=stock'},
+        {label:'2024新业绩报表-测试', link: '/?path=newResults'}
       ]
     }
   },