Merge branch 'ldeyun' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp into ldeyun

# Conflicts: # pages/views/renliziyuan/renyuanxinxi/qttongji.vue
人员台账单位和通用字段查询初步实现，还需进一步优化，钻取列表未做。
2025-02-13 22:31:14 +08:00 · 2025-02-13 01:51:44 +08:00 · 2025-02-12 02:21:11 +08:00 · 2025-02-11 17:09:35 +08:00
2 changed files with 656 additions and 624 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,5 +1,5 @@
 {
-  "name": "cxc-szcx-uniapp",
+  "name": "cxc-szcx-uniapp-master",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@ -19,7 +19,7 @@
    },
    "node_modules/base-64": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
    },
    "node_modules/dayjs": {
@ -61,7 +61,7 @@
    },
    "base-64": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
    },
    "dayjs": {
--- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
Author	SHA1	Message	Date
廖德云	9808821b70	Merge branch 'ldeyun' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp into ldeyun # Conflicts: # pages/views/renliziyuan/renyuanxinxi/qttongji.vue	2025-02-13 22:31:14 +08:00
廖德云	2a746146f0	人员台账单位和通用字段查询初步实现，还需进一步优化，钻取列表未做。	2025-02-13 01:51:44 +08:00
廖德云	1ef1384fa8	Merge branch 'master' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp # Conflicts: # .env.development # api/renyuan.js # manifest.json # pages.json # pages/views/renliziyuan/renyuanxinxi/index.vue # pages/views/renliziyuan/renyuanxinxi/tongji.vue	2025-02-12 02:21:11 +08:00
闵年泽	2183aab470	增加可配置人员统计页面	2025-02-11 17:09:35 +08:00