zhl-methods 1.1.11 → 1.1.14

package/VERSION.md

@@ -2,6 +2,19 @@
 
 版本更新日志
 
+### 1.1.14
+
+- ScanUDI 方法优化 生产日期到期日期 单独解析 单个解析失败不会影响另外的
+
+### 1.1.13
+
+- useRequest 方法 请求接口
+- usePageRequest 方法 请求接口-分页
+
+### 1.1.12
+
+- ScanUDI 方法 增加检测 日期是否正确 错误返回 msg
+
 ### 1.1.11
 
 - numberToPrice 方法 增加支持 字符串

package/index copy.js

@@ -0,0 +1,58 @@
+import jsMethods, {
+  isPhone,
+  isIDCode,
+  toUrlQuery,
+  numberToPrice,
+  priceToNumber,
+  setTwoDecimal,
+  getRandomNumber,
+  isType,
+  toTypeDate,
+  toInt,
+  copyText,
+  downloadFile,
+  debounce,
+  throttle,
+} from "./js";
+import ScanUDI from "./js/ScanUDI";
+import { useEmitter, useRequest, usePageRequest } from "./vue3";
+import wxMethods, {
+  getNavBarHeight,
+  confirmModal,
+  getEnv,
+  getAppId,
+  getSafeBottom,
+} from "./wx";
+const copyText = (val) => {
+  if (window) {
+    return jsMethods.copyText(val);
+  }
+  if (uni || wx) {
+    return wxMethods.copyText(val);
+  }
+};
+export {
+  isPhone,
+  isIDCode,
+  toUrlQuery,
+  numberToPrice,
+  priceToNumber,
+  setTwoDecimal,
+  getRandomNumber,
+  isType,
+  toTypeDate,
+  toInt,
+  downloadFile,
+  debounce,
+  throttle,
+  ScanUDI,
+  copyText,
+  useEmitter,
+  useRequest,
+  usePageRequest,
+  getNavBarHeight,
+  confirmModal,
+  getEnv,
+  getAppId,
+  getSafeBottom,
+};

package/index.js

@@ -0,0 +1,20 @@
+import jsMethods from "./js";
+import ScanUDI from "./js/ScanUDI";
+import hooks from "./vue3/hook";
+import wxMethods from "./wx";
+
+const defaultMethods = {
+  ...jsMethods,
+  ...wxMethods,
+  ScanUDI,
+  ...hooks,
+  copyText: (val) => {
+    if (window) {
+      return jsMethods.copyText(val);
+    }
+    if (uni || wx) {
+      return wxMethods.copyText(val);
+    }
+  },
+};
+export default defaultMethods;

package/js/ScanUDI.js

@@ -20,16 +20,22 @@ export default class ScanUDI {
     if ((str && str.length < 8) || !str) {
       return `请输入正确的条形码${str}`;
     }
-    let upc = "",
-      sku_number = "",
-      manufacture_time = "",
-      expiry_time = "",
-      batch_no = "",
-      serial_no = "";
+    this.upc = "";
+    this.sku_number = "";
+    this.manufacture_time = "";
+    this.expiry_time = "";
+    this.batch_no = "";
+    this.serial_no = "";
+    this.msg = "";
     // 净里镜内部编码
     if (str.includes("/")) {
-      [upc, sku_number, manufacture_time, expiry_time, batch_no, serial_no] =
-        str.split("/");
+      let arr = str.split("/");
+      this.upc = arr[0];
+      this.sku_number = arr[1];
+      this.manufacture_time = arr[2];
+      this.expiry_time = arr[3];
+      this.batch_no = arr[4];
+      this.serial_no = arr[5];
     } else if (str.includes("(")) {
       const regex = /\((\d{2})\)([^($$)]+)/g;
       let match;
@@ -37,11 +43,11 @@ export default class ScanUDI {
       while ((match = regex.exec(str)) !== null) {
         obj[match[1]] = match[2];
       }
-      upc = obj["01"];
-      manufacture_time = obj["11"];
-      expiry_time = obj["17"];
-      batch_no = obj["10"];
-      serial_no = obj["21"];
+      this.upc = obj["01"];
+      this.manufacture_time = obj["11"];
+      this.expiry_time = obj["17"];
+      this.batch_no = obj["10"];
+      this.serial_no = obj["21"];
     } else {
       if (
         this.rules.every(
@@ -52,19 +58,25 @@ export default class ScanUDI {
       }
       this.rules.forEach((v) => {
         if (str.length == v.length && str.substring(0, 2) == v.start_value) {
-          upc = str.substr(v.upc_rule.start, v.upc_rule.length);
-          batch_no = str.substr(v.batch_no_rule.start, v.batch_no_rule.length);
+          this.upc = str.substr(v.upc_rule.start, v.upc_rule.length);
+          this.batch_no = str.substr(
+            v.batch_no_rule.start,
+            v.batch_no_rule.length
+          );
           if (v.manufacture_rule) {
-            manufacture_time = str.substr(
+            this.manufacture_time = str.substr(
               v.manufacture_rule.start,
               v.manufacture_rule.length
             );
           }
           if (v.expiry_rule) {
-            expiry_time = str.substr(v.expiry_rule.start, v.expiry_rule.length);
+            this.expiry_time = str.substr(
+              v.expiry_rule.start,
+              v.expiry_rule.length
+            );
           }
           if (v.serial_no_rule) {
-            serial_no = str.substr(
+            this.serial_no = str.substr(
               v.serial_no_rule.start,
               v.serial_no_rule.length
             );
@@ -73,52 +85,67 @@ export default class ScanUDI {
       });
     }
     let obj = {
-      upc: this.removeFrontZeros(upc),
-      sku_number,
+      upc: this.removeFrontZeros(this.upc),
+      sku_number: this.sku_number,
       manufacture_time: this.setDateFormat(
-        manufacture_time,
+        this.manufacture_time,
         "manufacture",
-        expiry_time
+        this.expiry_time
+      ),
+      expiry_time: this.setDateFormat(
+        this.expiry_time,
+        "expiry",
+        this.manufacture_time
       ),
-      expiry_time: this.setDateFormat(expiry_time, "expiry", manufacture_time),
-      batch_no: batch_no.toUpperCase(),
-      serial_no,
+      batch_no: this.batch_no.toUpperCase(),
+      serial_no: this.serial_no,
       udi: str.replace(/[^a-zA-Z0-9]/g, ""),
+      msg: this.msg,
     };
     return obj;
   }
   setDateFormat(date, type, expand) {
     try {
       if (date) {
-        if (date.length === 8 && data.substr(data.length - 2) == "00") {
+        if (date.length === 8 && date.substr(date.length - 2) == "00") {
           if (type === "expiry") {
             date = dayjs(date).endOf("month");
           }
-          date = dayjs(date).startOf("month");
+          date = dayjs(date).startOf("month").add(1, "month");
         }
         if (date.length === 6) {
           if (date.substring(0, 2) === expand.substring(0, 2)) {
             // 年月(6位) - 202507
-            date = date + "01";
+            if (type === "expiry") {
+              date = dayjs(date + "00").endOf("month");
+            } else {
+              date = dayjs(date + "01");
+            }
           } else {
             // 年后两位月日(6位) - 250708
-            date = "20" + date;
+            date = dayjs("20" + date);
           }
         }
         // 年后两位月(4位) - 2507
         if (date.length === 4) {
           if (type === "expiry") {
-            date = dayjs("20" + date).endOf("month");
+            date = dayjs("20" + date + "00").endOf("month");
           }
-          date = "20" + date + "01";
+          date = dayjs("20" + date + "01");
+        }
+        if (date.format("YYYY-MM-DD") == "Invalid Date") {
+          this.batch_no = "";
+          this.msg = "警告：批次信息解析失败，请手动填写";
+          return "";
         }
-        return dayjs(date).format("YYYY-MM-DD");
+        return date.format("YYYY-MM-DD");
       } else {
         return "";
       }
     } catch (error) {
+      this.msg = "警告：解析失败，请联系技术人员处理";
       console.log(error, "setDateFormat error");
-      return date;
+      return "";
     }
   }
   removeFrontZeros(str) {
@@ -130,6 +157,3 @@ export default class ScanUDI {
     }
   }
 }
-const scanudi = new ScanUDI({ rules: [] });
-
-console.log(scanudi.parse("(01)00047144050546(17)261002(11)241003(10)GJ24117"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhl-methods",
-  "version": "1.1.11",
+  "version": "1.1.14",
   "license": "ISC",
   "dependencies": {
     "dayjs": "^1.11.15",

package/vue3/hook.js

@@ -0,0 +1,77 @@
+import { ref, getCurrentInstance } from "vue";
+const useEmitter = () => {
+  const internalInstance = getCurrentInstance();
+  const emitter = internalInstance.appContext.config.globalProperties.emitter;
+  return emitter;
+};
+//请求接口
+const useRequest = (api, options = {}) => {
+  const loading = ref(false);
+  const query = ref(options.query ? options.query : {});
+  const data = ref({});
+  const run = async (callback) => {
+    loading.value = true;
+    try {
+      let apiRequest;
+      if (options.setQueryFormat) {
+        apiRequest = options.setQueryFormat(query.value);
+      } else {
+        apiRequest = query.value;
+      }
+      const res = await api(apiRequest);
+      if (res.code === 200) {
+        data.value = res.data;
+        if (callback) {
+          callback(res);
+        } else if (options.success) {
+          options.success(res);
+        }
+      } else {
+        if (options.error) {
+          options.error(res);
+        }
+      }
+    } catch (err) {
+      if (options.error) {
+        options.error(err);
+      }
+    } finally {
+      loading.value = false;
+    }
+  };
+  if (options.autoRequest) {
+    run();
+  }
+  return [loading, query, data, run];
+};
+//请求接口-分页
+const usePageRequest = (api, options = {}) => {
+  const page = ref(1);
+  const limit = ref(15);
+  const total = ref(0);
+  const [loading, query, data, run] = useRequest(api, {
+    ...options,
+    query: {
+      page,
+      limit,
+      ...options.query,
+    },
+    success(res) {
+      total.value = res.data.total;
+    },
+  });
+
+  const pageChange = (p, l) => {
+    console.log(123);
+    page.value = p;
+    limit.value = l;
+    run();
+  };
+  const refresh = () => {
+    page.value = 1;
+    limit.value = 15;
+    run();
+  };
+  return [loading, query, data, page, limit, total, pageChange, refresh];
+};
+export { useEmitter, useRequest, usePageRequest };

package/vue3/index.js

@@ -1,7 +0,0 @@
-import { getCurrentInstance } from "vue";
-
-export function useEmitter() {
-  const internalInstance = getCurrentInstance();
-  const emitter = internalInstance.appContext.config.globalProperties.emitter;
-  return emitter;
-}