zouyu
昨天 8bc17a9ea84a6af0b7d01e451c702f404a3ff895
分支
用户 zouyu <2723363702@qq.com>
星期六, 一月 10, 2026 11:36 +0800
提交者 zouyu <2723363702@qq.com>
星期六, 一月 10, 2026 11:36 +0800
提交8bc17a9ea84a6af0b7d01e451c702f404a3ff895
目录 b57b73f83541cd76123c7fb8c426ad1a9305e10a 目录 | zip | gz
上一版本 80367ddf4383493729420bb62aa8c8ebb9616dd9 查看 | 对比
13c476675b82dc52678209bd00f6a6d317a99f08 查看 | 对比
Merge branch 'dev_tide' into dev_tide_cbsglxt

# Conflicts:
# .env.production
# index.html
# src/store/modules/user.js
# src/views/contractor/evaluateTemplate/index.vue
# src/views/environmentAccess/accessManagement/index.vue
# src/views/environmentAccess/intelligentInspectionManagement/index.vue
# src/views/environmentAccess/remoteMonitoringOfEquipment/index.vue
# src/views/environmentAccess/vehicleInformationCollection/index.vue
# src/views/financialManagement/expenseManagement/index.vue
# src/views/financialManagement/financialStatements/index.vue
# src/views/index.vue
# src/views/inventoryManagement/dispatchLog/index.vue
# src/views/inventoryManagement/issueManagement/index.vue
# src/views/inventoryManagement/receiptManagement/index.vue
# src/views/inventoryManagement/stockManagement/index.vue
# src/views/inventoryManagement/stockWarning/index.vue
# src/views/procurementManagement/paymentEntry/index.vue
# src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
# src/views/procurementManagement/procurementLedger/index.vue
# src/views/productionManagement/operationScheduling/components/formDia.vue
# src/views/productionManagement/operationScheduling/index.vue
# src/views/productionManagement/productionCosting/index.vue
# src/views/productionManagement/productionDispatching/components/formDia.vue
# src/views/productionManagement/productionDispatching/index.vue
# src/views/productionManagement/productionOrder/index.vue
# src/views/productionManagement/productionReporting/index.vue
# src/views/salesManagement/receiptPayment/index.vue
# src/views/salesManagement/receiptPaymentHistory/index.vue
# src/views/salesManagement/salesLedger/index.vue
# src/views/tideLogin.vue
# vite.config.js
已添加36个文件
已修改8个文件
15676 ■■■■■ 文件已修改
index.html 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/inventoryManagement/stockIn.js 78 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/inventoryManagement/stockManage.js 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/inventoryManagement/stockOut.js 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/inventoryManagement/stockReport.js 55 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/inventoryManagement/stockWarning.js 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/lavorissce/ledger.js 55 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/api/productionManagement/productionOrder.js 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/utils/index.js 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/environmentAccess/accessManagement/index.vue 347 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/environmentAccess/intelligentInspectionManagement/index.vue 581 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/environmentAccess/remoteMonitoringOfEquipment/index.vue 633 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/environmentAccess/vehicleInformationCollection/index.vue 577 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/accounting/index.vue 547 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/expenseManagement/index.vue 276 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/financialStatements/index.vue 507 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/inventoryAccounting/index.vue 390 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/index.vue 1361 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/dispatchLog/index.vue 371 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/index.vue 309 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/issueManagement/index.vue 337 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDia.vue 401 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue 310 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue 300 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/index.vue 212 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue 154 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue 147 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue 147 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/index.vue 387 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockReport/index.vue 713 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockWarning/index.vue 943 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/paymentEntry/index.vue 575 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue 196 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 1131 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/operationScheduling/components/formDia.vue 181 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/operationScheduling/index.vue 228 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionCosting/index.vue 166 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionDispatching/components/formDia.vue 167 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionDispatching/index.vue 164 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionOrder/index.vue 374 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionReporting/index.vue 401 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPayment/index.vue 640 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPaymentHistory/index.vue 208 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 1018 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史