snow 1 gadu atpakaļ
vecāks
revīzija
ab4f1e8e93

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.56ca9678.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.3f2ce645.js


BIN
dist/static/js/app.3f2ce645.js.gz


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.4ef64111.js


BIN
dist/static/js/app.4ef64111.js.gz


+ 1 - 1
src/components/newResults/company-month.vue

@@ -9,7 +9,7 @@
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px;width:150px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:125px" 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>
 

+ 4 - 3
src/components/newResults/company.vue

@@ -3,7 +3,7 @@
     <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;width:145px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:125px" 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>
 
@@ -16,7 +16,7 @@
       <el-table border size="mini" :data="tableData" :cell-class-name="setCellClassName">
         <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-if="scope.row.companyName.indexOf('普润') === -1">{{mapCompany[scope.row.companyName] || scope.row.companyName}}</div>
             <div v-else>
               <p style="margin:0px">普润</p>
               <p style="margin:0px">锦兴</p>
@@ -156,7 +156,8 @@ export default {
       tableData: [],
       companyNo: "",
       cp_companies: [],
-      isEmpty: false
+      isEmpty: false,
+      mapCompany
       // companies:[
       //   { value:"",label: "所有公司"},
       //   { value:"GS2302231125079621",label: "北京百辰荣达国际科贸有限公司"},

+ 3 - 3
src/components/newResults/department.vue

@@ -9,7 +9,7 @@
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px;width:145px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+      <el-select size="small" style="margin-right:10px;width:105px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
         <el-option 
           v-for="depart in companies" 
           :key="depart.value" 
@@ -38,7 +38,7 @@
     <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="45px" />
-        <el-table-column fixed="left" label="部门" prop="depart" align="center" width="70px">
+        <el-table-column fixed="left" label="部门" prop="depart" align="center" width="60px">
           <template slot-scope="scope">
             <p style="margin:0px" v-for="(chunk,index) in scope.row.depart.split('@')" :key="index">
               {{chunk}}
@@ -223,7 +223,7 @@ export default {
 
         let mapDepart = ["百辰","泓源","普润","平台"]
         list = mapDepart.map(d => list.find(({ depart }) => depart === d))
-        const mapToDepartment = { 百辰:"客服部@百辰荣达", 泓源:"网络部@泓源广诚", 普润:"	项目部@普润心堂", 平台:"	平台部@万宇恒通" }
+        const mapToDepartment = { 百辰:"客服部@百辰", 泓源:"网络部@泓源", 普润:"	项目部@普润", 平台:"	平台部@万宇" }
 
         const company = this.companies.find(item => item.value === this.companyNo);
         this.list = list.map(({depart,total_tips,dayinfo,monthinfo,mchannel_sale_total,mzy_sale_total,zy_cost_total,mchannel_cost_total,mzy_cost_total}) => {

+ 5 - 5
src/components/newResults/mapCompany.js

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

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels