Merge branch 'master' into 测试

src/views/group/data-board/material-control-purchasing/index.vue

@@ -46,7 +46,7 @@ const sourceList = ref({
 const sortField = ref([
   {
     dictKey: "turnoverRate",
-    dictValue: "周转率",
+    dictValue: "90天周转次数",
   },
   {
     dictKey: "predictOutStorageDays",
@@ -201,9 +201,9 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "周转率",
+        label: "90天周转次数",
         prop: "turnoverRate",
-        width: 100,
+        width: 150,
       },
     },
     {

src/views/group/data-board/material-in-transit/index.vue

@@ -147,9 +147,9 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "周转率",
+        label: "90天周转次数",
         prop: "turnoverRate",
-        width: 90,
+        width: 150,
       },
     },
     {

src/views/group/data-board/turnover-rate/index.vue

@@ -41,29 +41,29 @@
           </el-tooltip>
         </div>
       </template>
-      <template #turnoverRateThirtyDays>
-        <span>30天周转率</span>
+      <template #turnoverRateThirtyDaysHeader>
+        <span>30天周转次数</span>
         <el-tooltip class="box-item" effect="dark" placement="bottom">
           <template #content>
-            <div>库存周转率=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
+            <div>库存周转次数=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
           </template>
           <el-icon style="cursor: pointer; margin-left: 4px; transform: translateY(2px)"><QuestionFilled /></el-icon>
         </el-tooltip>
       </template>
-      <template #turnoverRateSixtyDays>
-        <span>60天周转率</span>
+      <template #turnoverRateSixtyDaysHeader>
+        <span>60天周转次数</span>
         <el-tooltip class="box-item" effect="dark" placement="bottom">
           <template #content>
-            <div>库存周转率=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
+            <div>库存周转次数=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
           </template>
           <el-icon style="cursor: pointer; margin-left: 4px; transform: translateY(2px)"><QuestionFilled /></el-icon>
         </el-tooltip>
       </template>
-      <template #turnoverRateNinetyDays>
-        <span>90天周转率</span>
+      <template #turnoverRateNinetyDaysHeader>
+        <span>90天周转次数</span>
         <el-tooltip class="box-item" effect="dark" placement="bottom">
           <template #content>
-            <div>库存周转率=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
+            <div>库存周转次数=时间段天数/（时间段天数X (1/2) X (期初库存数量+期末库存数量）/时间段销售量）</div>
           </template>
           <el-icon style="cursor: pointer; margin-left: 4px; transform: translateY(2px)"><QuestionFilled /></el-icon>
         </el-tooltip>
@@ -80,6 +80,7 @@ import moment from "moment";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("1");
+const departmentList = ref([]);
 const sourceList = ref({
   loading: false,
   data: [],
@@ -115,6 +116,12 @@ const searchConfig = computed(() => {
       dictKey: "bom_chromatophore",
       label: "色层",
     },
+    {
+      type: "select",
+      prop: "departmentId",
+      data: departmentList.value,
+      label: "事业部",
+    },
   ];
 });
 const config = computed(() => {
@@ -156,10 +163,10 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "30天周转率",
+        label: "30天周转次数",
         prop: "turnoverRateThirtyDays",
-        width: 140,
-        slotHeader: "turnoverRateThirtyDays",
+        width: 155,
+        slotHeader: "turnoverRateThirtyDaysHeader",
       },
       sortable: true,
       header: true,
@@ -173,10 +180,10 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "60天周转率",
+        label: "60天周转次数",
         prop: "turnoverRateSixtyDays",
-        width: 140,
-        slotHeader: "turnoverRateSixtyDays",
+        width: 155,
+        slotHeader: "turnoverRateSixtyDaysHeader",
       },
       sortable: true,
       header: true,
@@ -190,10 +197,10 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "90天周转率",
+        label: "90天周转次数",
         prop: "turnoverRateNinetyDays",
-        width: 140,
-        slotHeader: "turnoverRateNinetyDays",
+        width: 155,
+        slotHeader: "turnoverRateNinetyDaysHeader",
       },
       sortable: true,
       header: true,
@@ -214,6 +221,21 @@ const config = computed(() => {
     },
   ];
 });
+const getDemandData = () => {
+  proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      departmentList.value = departmentList.value.concat(
+        res.rows.map((item) => {
+          return {
+            dictKey: item.id,
+            dictValue: item.name,
+          };
+        })
+      );
+    }
+  });
+};
+getDemandData();
 const getList = (req, status) => {
   if (status) {
     sourceList.value.pagination = {};
@@ -251,9 +273,9 @@ const deriveExcel = () => {
           fileReader.readAsText(res);
         } else {
           if (activeName.value == "1") {
-            proxy.downloadFile(res, "周转率-裸垫-" + moment().format("yyyy-MM-DD") + ".xlsx");
+            proxy.downloadFile(res, "周转次数-裸垫-" + moment().format("yyyy-MM-DD") + ".xlsx");
           } else {
-            proxy.downloadFile(res, "周转率-裸砖-" + moment().format("yyyy-MM-DD") + ".xlsx");
+            proxy.downloadFile(res, "周转次数-裸砖-" + moment().format("yyyy-MM-DD") + ".xlsx");
           }
         }
       });