Merge remote-tracking branch 'origin/kes-vue' into kes-vue

src/views/finance/left-down1.vue

@@ -3,7 +3,7 @@
     <div class="bg-color-black">
       <div class="plan-header">
         <div class="d-flex pt-1 pl-2 jc-center">
-          <span class="text mx-2 fw-b">每周车间达成率</span>
+          <span class="text mx-2 fw-b">销售达成率</span>
         </div>
       </div>
       <div class="plan-body">
@@ -23,14 +23,14 @@ export default {
   data() {
     return {
       config: {
-        header: ['员工','部门名称', '月销售目标','月销售额','月达成率%','年销售目标','年销售额','年达成率%'],
+        header: ['员工','部门名称', '月目标','月销售额','月达成率','年目标','年销售额','年达成率'],
         data: [],
         rowNum: 10,
         headerHeight: 30,
         headerBGC: 'rgba(15,19,37,0.1)',
         oddRowBGC: 'rgba(15,19,37,0.1)',
         evenRowBGC: 'rgba(23,28,51,0.1)',
-        columnWidth: [80, 100, 90,100,90,90,90,90],
+        columnWidth: [90,110,90,100,100,90,100,100],
         align: ['center', 'center', 'center', 'center','center','center','center','center']
       },
       refreshInterval: null,
@@ -85,11 +85,14 @@ export default {
     formatRowData(item) {
       const rowClass = 'colorGrass';
       return [
-        this.createCell(item.week_number, rowClass),
-        this.createCell(item.highest_getrate_wc, rowClass),
-        this.createCell(item.highest_getrate, rowClass),
-        this.createCell(item.highest_okrate_wc, rowClass),
-        this.createCell(item.highest_okrate, rowClass)
+        this.createCell(item.sellername, rowClass),
+        this.createCell(item.departmentname, rowClass),
+        this.createCell(item.goal, rowClass),
+        this.createCell(item.total, rowClass),
+        this.createCell(item.goalrate, rowClass),
+        this.createCell(item.goalyear, rowClass),
+        this.createCell(item.totalyear, rowClass),
+        this.createCell(item.goalrateyear, rowClass)
       ]
     },
     createCell(content, className) {

src/views/finance/left-down2.vue

@@ -10,9 +10,9 @@
             <div class="location">
               <div class="circle-hollow">
                 <div class="info">
-                  <h2 class="pb-2">{{inQty}}</h2>
+                  <h2 class="pb-2">{{monthamount}}万元</h2>
                   <p class="fs-xxl pt-2">
-                    入库数量
+                    月出货金额
                   </p>
                 </div>
               </div>
@@ -21,9 +21,9 @@
           <div class="item d-flex jc-center flex-column">
             <div class="circle-hollow">
               <div class="info">
-                <h2 class="pb-2">{{outQty}}</h2>
+                <h2 class="pb-2">{{yearamount}}万元</h2>
                 <p class="fs-xxl pt-2">
-                  出货数量
+                  年出货金额
                 </p>
               </div>
             </div>
@@ -41,7 +41,7 @@
               <div class="location">
                 <div class="circle-hollow">
                   <div class="info">
-                    <h2 class="pb-2">{{monthamount}}</h2>
+                    <h2 class="pb-2">{{monthinqty}}万元</h2>
                     <p class="fs-xxl pt-2">
                       月完工金额
                     </p>
@@ -52,7 +52,7 @@
             <div class="item d-flex jc-center flex-column">
               <div class="circle-hollow">
                 <div class="info">
-                  <h2 class="pb-2">{{yearamount}}</h2>
+                  <h2 class="pb-2">{{yearinqty}}万元</h2>
                   <p class="fs-xxl pt-2">
                     年完工金额
                   </p>
@@ -79,6 +79,8 @@ export default {
       yearamount : 0,
       inQty : 0,
       outQty : 0,
+      monthinqty :0,
+      yearinqty :0,
       timing: null,
     }
   },
@@ -98,11 +100,11 @@ export default {
     async getdata() {
       this.monthamount = 0;
       this.yearamount = 0;
-      this.inQty = 0;
-      this.outQty = 0;
+      this.monthinqty = 0;
+      this.yearinqty = 0;
 
       //成品完工出货
-      var caller = 'KB!FIN!FINISHDATA';
+      var caller = 'KB!FIN!FINDATA';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1"
@@ -110,8 +112,8 @@ export default {
       }).then((result) => {
             let dataList = JSON.parse(result.data.data);
             if(dataList.length>0){
-              this.inQty = dataList[0].inqty;
-              this.outQty = dataList[0].outqty;
+              this.monthamount = dataList[0].month_out;
+              this.yearamount = dataList[0].year_out;
             }
           }, (result) => {
             console.error(result)
@@ -120,7 +122,7 @@ export default {
 
 
       //完工金额
-      caller = 'KB!FIN!FINISHAMOUNT';
+      caller = 'KB!FIN!FINAMOUNT';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1"
@@ -128,8 +130,8 @@ export default {
       }).then((result) => {
             let dataList = JSON.parse(result.data.data);
             if(dataList.length>0){
-              this.monthamount = dataList[0].monthamount;
-              this.yearamount = dataList[0].yearamount;
+              this.monthinqty = dataList[0].month_inqty;
+              this.yearinqty = dataList[0].year_inqty;
             }
           }, (result) => {
             console.error(result)

src/views/prodline/bottom1.vue

@@ -61,7 +61,7 @@ export default {
         carousel: 'page',
         hoverPause: true,
         // 添加等待时间确保高度计算正确
-        waitTime: 10000
+        waitTime: 20000
       },
       timing: null,
       componentKey: 0,