East 3 лет назад
Родитель
Сommit
66f71fce53
3 измененных файлов с 82 добавлено и 112 удалено
  1. 20 2
      src/utils/chenApi.js
  2. 50 96
      src/views/Production/Production.vue
  3. 12 14
      src/views/Production/board/YingShou.vue

+ 20 - 2
src/utils/chenApi.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-25 14:38:41
- * @LastEditTime: 2021-11-25 15:24:37
+ * @LastEditTime: 2021-11-28 17:26:20
  * @LastEditors: Please set LastEditors
  * @Description: 也是网络接口的 api
  * @FilePath: \hyyfScreen\src\utils\chenApi.js
@@ -9,7 +9,7 @@
 import axios from "./http"
 
 /** 生产经营 */
-/* 存栏结构 */
+// 存栏结构
 export function getInventoryAndProduct(data) {
   return axios({
     url: '/produce/prodStock/listERP',
@@ -26,3 +26,21 @@ export function getInventoryLines(data) {
     params: data
   })
 }
+
+// 重要指标
+export function getProductionCondition(params) {
+  return axios({
+    url: '/produce/prodProduce/listProducee',
+    method: 'get',
+    params: params
+  })
+}
+
+// 应付
+export function getYingFu(data) {
+  return axios({
+    url: '/produce/prodPayableRank/listPayable',
+    method: 'get',
+    params: data
+  })
+}

+ 50 - 96
src/views/Production/Production.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-21 17:51:22
- * @LastEditTime: 2021-11-25 15:34:11
+ * @LastEditTime: 2021-11-28 17:58:59
  * @LastEditors: Please set LastEditors
  * @Description: 生产经营页面
  * @FilePath: \hyyfScreen\src\views\Production\Production.vue
@@ -174,8 +174,8 @@
       </div>
 
       <div class="production-column-item">
-        <pro-board :title="'应排名'">
-          <ying-shou :data="yingshouData"></ying-shou>
+        <pro-board :title="'应排名'">
+          <ying-shou :data="yingfuData"></ying-shou>
         </pro-board>
       </div>
     </div>
@@ -285,7 +285,12 @@ import IndicatorItem from "./board/IndicatorItem.vue";
 import IndicatorOneChart from "./board/IndicatorOneChart.vue";
 
 // 网络请求
-import { getInventoryAndProduct, getInventoryLines } from "../../utils/chenApi";
+import {
+  getInventoryAndProduct,
+  getInventoryLines,
+  getProductionCondition,
+  getYingFu,
+} from "../../utils/chenApi";
 
 export default {
   name: "Production",
@@ -410,43 +415,7 @@ export default {
         quantitys: [46, 45, 100],
         sellDates: ["10-20周三", "10-21周四", "10-22周五"],
       },
-      yingshouData: [
-        {
-          rate: 1,
-          name: "XX屠宰有限公司",
-          money: 23515,
-          person: "大概",
-          phone: "1654564654",
-        },
-        {
-          rate: 2,
-          name: "XX屠宰有限公司",
-          money: 23515,
-          person: "大概",
-          phone: "1654564654",
-        },
-        {
-          rate: 3,
-          name: "XX屠宰有限公司",
-          money: 23515,
-          person: "大概",
-          phone: "1654564654",
-        },
-        {
-          rate: 4,
-          name: "XX屠宰有限公司",
-          money: 23515,
-          person: "大概",
-          phone: "1654564654",
-        },
-        {
-          rate: 5,
-          name: "XX屠宰有限公司",
-          money: 23515,
-          person: "大概",
-          phone: "1654564654",
-        },
-      ],
+      yingfuData: [],
       historyData: [
         {
           id: 1,
@@ -480,38 +449,7 @@ export default {
         },
       ],
       ifWorkInfos: false, // 工作看板点击后出现的工作任务
-      importantData: [
-        {
-          id: 1,
-          name: "产房存活率",
-          num: "99.4%",
-        },
-        {
-          id: 2,
-          name: "保育成活率",
-          num: "99.4%",
-        },
-        {
-          id: 3,
-          name: "育肥成活率",
-          num: "99.4%",
-        },
-        {
-          id: 4,
-          name: "七日内断配率",
-          num: "99.4%",
-        },
-        {
-          id: 5,
-          name: "配种分娩率",
-          num: "99.4%",
-        },
-        {
-          id: 6,
-          name: "PSY",
-          num: "99.4%",
-        },
-      ],
+      importantData: [],
       costPieData: [
         {
           name: "药品成本",
@@ -634,6 +572,8 @@ export default {
   mounted() {
     this.initInventoryAndProduct();
     this.initInventoryLines();
+    this.initProductionCondition(); // 重要指标 - 百分率
+    this.initYingFu(); // 应付排名
   },
   methods: {
     getWorkInfo(value) {
@@ -670,29 +610,6 @@ export default {
             res.data["piglet_stock"],
             res.data["fatpig_stock"],
           ];
-          // this.inventoryItemsData = [
-          //   res.data["sow_stock"].stockQuantity,
-          //   res.data["sow_stock_1"].stockQuantity,
-          //   res.data["sow_stock_2"].stockQuantity,
-          //   res.data["sow_stock_3"].stockQuantity,
-          //   res.data["boar_stock"].stockQuantity,
-          // ];
-          // this.productionPercents = [
-          //   res.data[12].rate * 100,
-          //   res.data[13].rate * 100,
-          //   res.data[14].rate * 100,
-          //   res.data[15].rate * 100,
-          //   res.data[16].rate * 100,
-          // ];
-        } else {
-          // this.inventoryLinesData = {
-          //   boarStock: [],
-          //   fatpigStock: [],
-          //   griceStock: [],
-          //   month: [],
-          //   pigletStock: [],
-          //   sowStock: []
-          // }
         }
       });
     },
@@ -713,6 +630,43 @@ export default {
         }
       });
     },
+    // 重要指标 - 百分率
+    initProductionCondition() {
+      getProductionCondition({}).then((res) => {
+        this.importantData = [];
+        if (res.code === 10000) {
+          const items = [
+            "grice_rate",
+            "piglet_rate",
+            "fatpig_rate",
+            "break_rate",
+            "breed_rate",
+            "psy",
+          ];
+          items.forEach((item) => {
+            let itemNum =
+              (parseFloat(res.data[item].stockQuantity) * 100).toFixed(2) + "%";
+            if (item === "psy") {
+              itemNum = res.data[item].stockQuantity;
+            }
+            this.importantData.push({
+              id: res.data[item].id,
+              name: res.data[item].stockName,
+              num: itemNum,
+            });
+          });
+        }
+      });
+    },
+    // 应付排名
+    initYingFu() {
+      getYingFu({}).then((res) => {
+        console.log("应付", res);
+        if (res.code === 10000) {
+          this.yingfuData = res.data;
+        }
+      });
+    },
   },
 };
 </script>

+ 12 - 14
src/views/Production/board/YingShou.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-26 14:18:22
- * @LastEditTime: 2021-10-26 14:43:50
+ * @LastEditTime: 2021-11-28 18:01:01
  * @LastEditors: Please set LastEditors
  * @Description: 应收排名
  * @FilePath: \hyyfScreen\src\views\Production\board\YingShou.vue
@@ -11,17 +11,15 @@
     <div class="content">
       <div class="title">
         <div class="item">排名</div>
-        <div class="item">名称</div>
+        <div class="item">牧场名称</div>
         <div class="item">金额</div>
-        <div class="item">联系人</div>
-        <div class="item">联系电话</div>
+        <div class="item">供应商</div>
       </div>
-      <div v-for="item in data" :key="item.rate" class="data">
-        <div class="item">{{ item.rate }}</div>
-        <div class="item">{{ item.name }}</div>
+      <div v-for="item in data" :key="item.rank" class="data">
+        <div class="item">{{ item.rank }}</div>
+        <div class="item">{{ item.farmName }}</div>
         <div class="item grey">{{ item.money }}</div>
-        <div class="item grey">{{ item.person }}</div>
-        <div class="item grey">{{ item.phone }}</div>
+        <div class="item grey">{{ item.suppier }}</div>
       </div>
     </div>
   </div>
@@ -31,10 +29,10 @@ export default {
   props: {
     data: {
       type: Array,
-      default: () => []
-    }
-  }
-}
+      default: () => [],
+    },
+  },
+};
 </script>
 <style scoped>
 .ying-shou {
@@ -57,7 +55,7 @@ export default {
   font-size: 15px;
 }
 .item {
-  width: 20%;
+  width: 25%;
 }
 
 .data {