product-inventory-management.git

Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 648003a577ef7a03046269c77fc5cc64199945e7

分支
用户	zouyu <2723363702@qq.com>
	星期二, 一月 20, 2026 17:06 +0800
提交者	zouyu <2723363702@qq.com>
	星期二, 一月 20, 2026 17:06 +0800
提交	648003a577ef7a03046269c77fc5cc64199945e7
目录	36a551b746232123aa8be941f230953f319ebe1e 目录 \| zip \| gz
上一版本	f4aaa6d7b651dc6cb14461b56183ed551d5ff1ff 查看 \| 对比 e03ff28fb1dbaa19571b7ea0414e0161f178cf26 查看 \| 对比

Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

# Conflicts:
#	.env.production
#	index.html
#	package.json
#	src/api/collaborativeApproval/attendanceManagement.js
#	src/api/collaborativeApproval/enterpriseBook.js
#	src/api/inventoryManagement/stockIn.js
#	src/api/inventoryManagement/stockManage.js
#	src/api/productionManagement/productionOrder.js
#	src/router/index.js
#	src/store/modules/user.js
#	src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
#	src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
#	src/views/collaborativeApproval/approvalProcess/index.vue
#	src/views/collaborativeApproval/enterpriseBook/index.vue
#	src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
#	src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue
#	src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue
#	src/views/collaborativeApproval/notificationManagement/summary/index.vue
#	src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
#	src/views/collaborativeApproval/sealManagement/index.vue
#	src/views/equipmentManagement/upkeep/index.vue
#	src/views/financialManagement/accounting/index.vue
#	src/views/financialManagement/financialStatements/index.vue
#	src/views/financialManagement/inventoryAccounting/index.vue
#	src/views/index.vue
#	src/views/inventoryManagement/dispatchLog/index.vue
#	src/views/inventoryManagement/issueManagement/index.vue
#	src/views/inventoryManagement/receiptManagement/components/formDia.vue
#	src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
#	src/views/inventoryManagement/receiptManagement/index.vue
#	src/views/inventoryManagement/stockManagement/index.vue
#	src/views/inventoryManagement/stockReport/index.vue
#	src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
#	src/views/personnelManagement/onboarding/index.vue
#	src/views/procurementManagement/invoiceEntry/indexOld.vue
#	src/views/procurementManagement/paymentEntry/index.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/reportAnalysis/projectProfit/index.vue
#	src/views/salesManagement/invoiceRegistration/index.vue
#	src/views/salesManagement/receiptPayment/index.vue
#	src/views/system/dept/index.vue
#	src/views/system/user/index.vue
#	src/views/tideLogin.vue
#	vite.config.js

已添加15个文件

已修改50个文件

	.env.production	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/collaborativeApproval/enterpriseBook.js	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/financialManagement/financialReconciliation.js	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/financialManagement/fundsManagement.js	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/inventoryManagement/stockManage.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/inventoryManagement/stockWarningLedger.js	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/procurementManagement/procurementLedger.js	115 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/productionManagement/productionOrder.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/PIMTable/PIMTable.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/router/index.js	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/store/modules/user.js	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/utils/auth.js	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/demo/fakePage/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/energyManagement/dynamicEnergySaving/index.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/energyManagement/gasManagement/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/equipmentManagement/ledger/index.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipmentManagement/repair/index.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/financialManagement/financialReconciliation/index.vue	291 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/financialManagement/fundsManagement/index.vue	298 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/index.vue	250 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/receiptManagement/components/formDia.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue	310 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue	163 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue	147 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue	147 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/inventoryManagement/stockWarningLedger/index.vue	347 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/monitor/job/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/monitor/job/log.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/monitor/logininfor/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/monitor/online/index.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/monitor/operlog/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/personnelManagement/onboarding/index.vue	348 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/paymentLedger/index.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue	230 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/procurementInvoiceLedger/indexOld.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/productionManagement/operationScheduling/components/formDia.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/productionManagement/productionDispatching/components/formDia.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/productionManagement/productionReporting/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/productionManagement/safetyMonitoring/index.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/salesManagement/invoiceLedger/index.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/salesManagement/receiptPaymentHistory/index.vue	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/salesManagement/receiptPaymentLedger/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/salesManagement/salesLedger/fileList.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/salesManagement/salesLedger/index.vue	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/config/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/dict/data.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/dict/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/menu/index.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/notice/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/post/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/role/authUser.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/role/index.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/role/selectUser.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/user/authRole.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/tideLogin.vue	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/tool/gen/editTable.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/tool/gen/importTable.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/tool/gen/index.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	vite.config.js	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史