Browse Source

部分bug

cz 1 năm trước cách đây
mục cha
commit
041987023a

+ 1 - 1
src/views/dataBoard/board/employeeAnalysis/index.vue

@@ -502,7 +502,7 @@ const clickBtn = (val) => {
     case 5:
       year = today.getFullYear();
       startDate = new Date(year - 1, 0, 1);
-      endDate = new Date(year, 11, 31);
+      endDate = new Date(year - 1, 11, 31);
       break;
     case 6:
       year = today.getFullYear();

+ 10 - 1
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -248,7 +248,7 @@
                 {{ item.productName }}
               </div>
               <div class="contentRow" style="width: 100px; text-align: center">
-                {{ item.productUnit }}
+                {{ dictValueLabel(item.productUnit, productUnit) }}
               </div>
               <div class="contentRow" style="width: 100px; text-align: center">
                 {{ item.quantity }}
@@ -409,6 +409,8 @@ const customerList = ref([]);
 const tradeMethods = ref([]);
 const accountCurrency = ref([]);
 const shippingMethod = ref([]);
+const productUnit = ref([]);
+
 const status = ref([
   {
     label: "草稿",
@@ -665,6 +667,12 @@ const getDict = () => {
         });
       }
     });
+  proxy.getDictOne(["unit"]).then((res) => {
+    productUnit.value = res["unit"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
 };
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
@@ -710,6 +718,7 @@ const clickPrint = (row) => {
   openPrint.value = true;
   proxy.post("/saleQuotation/detail", { id: row.id }).then((res) => {
     printDetails.value = res;
+    console.log(res, "aaa");
   });
 };
 const clickDownload = () => {